Submodules: Don't parse .gitmodules when it contains, merge conflicts
Jens Lehmann committed over 15 years ago
test that git status works with merge conflict in, .gitmodules
Heiko Voigt committed over 15 years ago
Bigfile: teach "git add" to send a large file straight to a pack
Junio C Hamano committed over 15 years ago
git-p4: warn if git authorship won't be retained
Luke Diamand committed over 15 years ago
Update draft release notes to 1.7.6
Junio C Hamano committed over 15 years ago
Merge branch 'bf/commit-template-no-cleanup'
Junio C Hamano committed over 15 years ago
Merge branch 'jc/t1506-shell-param-expansion-gotcha'
Junio C Hamano committed over 15 years ago
Merge branch 'rr/rerere-libify-clear-gc'
Junio C Hamano committed over 15 years ago
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'
Junio C Hamano committed over 15 years ago
Merge branch 'jh/dirstat-lines'
Junio C Hamano committed over 15 years ago
Merge branch 'jc/fix-add-u-unmerged'
Junio C Hamano committed over 15 years ago
Merge branch 'jn/setup-revisions-glob-and-friends-passthru'
Junio C Hamano committed over 15 years ago
Merge branch 'cn/log-parse-opt'
Junio C Hamano committed over 15 years ago
Junio C Hamano committed over 15 years ago
Junio C Hamano committed over 15 years ago
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
Junio C Hamano committed over 15 years ago
Merge branch 'js/blame-parsename' into maint
Junio C Hamano committed over 15 years ago
Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint
Junio C Hamano committed over 15 years ago
Merge branch 'cj/p4merge' into maint
Junio C Hamano committed over 15 years ago
Merge branch 'jk/merge-one-file-working-tree' into maint
Junio C Hamano committed over 15 years ago