Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-03 | 2 | -5/+5 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | Documentation: read-tree --prefix works with existing subtrees | Clemens Buchacher | 2012-01-01 | 1 | -5/+4 | |
| | * | | | Add MYMETA.json to perl/.gitignore | Jack Nagel | 2011-12-29 | 1 | -0/+1 | |
| | |/ / | ||||||
| * | | | docs: describe behavior of relative submodule URLs | Jens Lehmann | 2012-01-03 | 1 | -1/+6 | |
* | | | | fix hang in git fetch if pointed at a 0 length bundle | Brian Harring | 2012-01-03 | 2 | -2/+8 | |
* | | | | Git 1.7.8.2v1.7.8.2 | Junio C Hamano | 2011-12-28 | 3 | -2/+73 | |
* | | | | Merge branch 'jv/maint-config-set' into maint | Junio C Hamano | 2011-12-28 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix an incorrect reference to --set-all.jv/maint-config-set | Jelmer Vernooij | 2011-12-27 | 1 | -1/+1 | |
* | | | | | Merge branch 'jk/follow-rename-score' into maint | Junio C Hamano | 2011-12-28 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | use custom rename score during --followjk/follow-rename-score | Jeff King | 2011-12-16 | 1 | -0/+1 | |
* | | | | | | Merge branch 'jc/checkout-m-twoway' into maint | Junio C Hamano | 2011-12-28 | 2 | -24/+85 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | t/t2023-checkout-m.sh: fix use of test_must_failjc/checkout-m-twoway | Ævar Arnfjörð Bjarmason | 2011-12-20 | 1 | -1/+3 | |
| * | | | | | | checkout_merged(): squelch false warning from some gcc | Junio C Hamano | 2011-12-15 | 1 | -1/+1 | |
| * | | | | | | Test 'checkout -m -- path' | Pete Harlan | 2011-12-11 | 1 | -0/+47 | |
| * | | | | | | checkout -m: no need to insist on having all 3 stages | Junio C Hamano | 2011-12-06 | 1 | -24/+36 | |
* | | | | | | | Merge branch 'tr/doc-sh-setup' into maint | Junio C Hamano | 2011-12-28 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | git-sh-setup: make require_clean_work_tree part of the interfacetr/doc-sh-setup | Thomas Rast | 2011-12-20 | 1 | -0/+10 | |
* | | | | | | | | Merge branch 'jk/maint-strbuf-missing-init' into maint | Junio C Hamano | 2011-12-28 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-init | Junio C Hamano | 2011-12-18 | 1331 | -35289/+138034 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | commit, merge: initialize static strbuf | Jeff King | 2011-12-18 | 2 | -2/+2 | |
* | | | | | | | | | | Merge branch 'jk/maint-push-v-is-verbose' into maint | Junio C Hamano | 2011-12-28 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | make "git push -v" actually verbosejk/maint-push-v-is-verbose | Jeff King | 2011-12-17 | 1 | -5/+5 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jk/http-push-to-empty' into maint | Junio C Hamano | 2011-12-28 | 2 | -3/+36 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | remote-curl: don't pass back fake refsjk/http-push-to-empty | Jeff King | 2011-12-19 | 2 | -3/+36 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jk/doc-fsck' into maint | Junio C Hamano | 2011-12-28 | 1 | -18/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | docs: brush up obsolete bits of git-fsck manpagejk/doc-fsck | Jeff King | 2011-12-16 | 1 | -18/+8 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint | Junio C Hamano | 2011-12-28 | 1 | -10/+50 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | lf_to_crlf_filter(): resurrect CRLF->CRLF hackjc/maint-lf-to-crlf-keep-crlf | Junio C Hamano | 2011-12-18 | 1 | -10/+50 | |
* | | | | | | | | | | | Merge branch 'ef/setenv-putenv' into maint | Junio C Hamano | 2011-12-28 | 1 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | compat/setenv.c: error if name contains '='ef/setenv-putenv | Erik Faye-Lund | 2011-12-14 | 1 | -1/+1 | |
| * | | | | | | | | | | | compat/setenv.c: update errno when erroring out | Erik Faye-Lund | 2011-12-14 | 1 | -2/+8 | |
* | | | | | | | | | | | | Merge branch 'jc/advice-doc' into maint | Junio C Hamano | 2011-12-28 | 1 | -11/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | advice: Document that they all default to truejc/advice-doc | Junio C Hamano | 2011-12-18 | 1 | -11/+8 | |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jn/maint-sequencer-fixes' into maint | Junio C Hamano | 2011-12-28 | 6 | -126/+252 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | revert: stop creating and removing sequencer-old directoryjn/maint-sequencer-fixes | Jonathan Nieder | 2011-12-12 | 3 | -21/+7 | |
| * | | | | | | | | | | | | Revert "reset: Make reset remove the sequencer state" | Jonathan Nieder | 2011-12-12 | 3 | -55/+1 | |
| * | | | | | | | | | | | | revert: do not remove state until sequence is finished | Jonathan Nieder | 2011-12-12 | 2 | -14/+4 | |
| * | | | | | | | | | | | | revert: allow single-pick in the middle of cherry-pick sequence | Jonathan Nieder | 2011-12-12 | 2 | -0/+38 | |
| * | | | | | | | | | | | | revert: pass around rev-list args in already-parsed form | Jonathan Nieder | 2011-12-12 | 2 | -24/+34 | |
| * | | | | | | | | | | | | revert: allow cherry-pick --continue to commit before resuming | Jonathan Nieder | 2011-12-12 | 2 | -6/+156 | |
| * | | | | | | | | | | | | revert: give --continue handling its own function | Jonathan Nieder | 2011-12-12 | 1 | -11/+17 | |
* | | | | | | | | | | | | | Merge branch 'jk/maint-snprintf-va-copy' into maint | Junio C Hamano | 2011-12-28 | 1 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | compat/snprintf: don't look at va_list twicejk/maint-snprintf-va-copy | Jeff King | 2011-12-12 | 1 | -2/+7 | |
* | | | | | | | | | | | | | | Merge branch 'jk/maint-push-over-dav' into maint | Junio C Hamano | 2011-12-28 | 7 | -5/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | http-push: enable "proactive auth"jk/maint-push-over-dav | Jeff King | 2011-12-13 | 6 | -6/+13 | |
| * | | | | | | | | | | | | | | t5540: test DAV push with authentication | Jeff King | 2011-12-13 | 2 | -0/+37 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/maint-mv' into maint | Junio C Hamano | 2011-12-28 | 2 | -4/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | mv: be quiet about overwritingjk/maint-mv | Jeff King | 2011-12-12 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | mv: improve overwrite warning | Jeff King | 2011-12-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | mv: make non-directory destination error more clear | Jeff King | 2011-12-12 | 1 | -1/+1 |