summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-032-5/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Documentation: read-tree --prefix works with existing subtreesClemens Buchacher2012-01-011-5/+4
| | * | | Add MYMETA.json to perl/.gitignoreJack Nagel2011-12-291-0/+1
| | |/ /
| * | | docs: describe behavior of relative submodule URLsJens Lehmann2012-01-031-1/+6
* | | | fix hang in git fetch if pointed at a 0 length bundleBrian Harring2012-01-032-2/+8
* | | | Git 1.7.8.2v1.7.8.2Junio C Hamano2011-12-283-2/+73
* | | | Merge branch 'jv/maint-config-set' into maintJunio C Hamano2011-12-281-1/+1
|\ \ \ \
| * | | | Fix an incorrect reference to --set-all.jv/maint-config-setJelmer Vernooij2011-12-271-1/+1
* | | | | Merge branch 'jk/follow-rename-score' into maintJunio C Hamano2011-12-281-0/+1
|\ \ \ \ \
| * | | | | use custom rename score during --followjk/follow-rename-scoreJeff King2011-12-161-0/+1
* | | | | | Merge branch 'jc/checkout-m-twoway' into maintJunio C Hamano2011-12-282-24/+85
|\ \ \ \ \ \
| * | | | | | t/t2023-checkout-m.sh: fix use of test_must_failjc/checkout-m-twowayÆvar Arnfjörð Bjarmason2011-12-201-1/+3
| * | | | | | checkout_merged(): squelch false warning from some gccJunio C Hamano2011-12-151-1/+1
| * | | | | | Test 'checkout -m -- path'Pete Harlan2011-12-111-0/+47
| * | | | | | checkout -m: no need to insist on having all 3 stagesJunio C Hamano2011-12-061-24/+36
* | | | | | | Merge branch 'tr/doc-sh-setup' into maintJunio C Hamano2011-12-281-0/+10
|\ \ \ \ \ \ \
| * | | | | | | git-sh-setup: make require_clean_work_tree part of the interfacetr/doc-sh-setupThomas Rast2011-12-201-0/+10
* | | | | | | | Merge branch 'jk/maint-strbuf-missing-init' into maintJunio C Hamano2011-12-282-2/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-initJunio C Hamano2011-12-181331-35289/+138034
| |\ \ \ \ \ \ \ \
| * | | | | | | | | commit, merge: initialize static strbufJeff King2011-12-182-2/+2
* | | | | | | | | | Merge branch 'jk/maint-push-v-is-verbose' into maintJunio C Hamano2011-12-281-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | make "git push -v" actually verbosejk/maint-push-v-is-verboseJeff King2011-12-171-5/+5
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/http-push-to-empty' into maintJunio C Hamano2011-12-282-3/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remote-curl: don't pass back fake refsjk/http-push-to-emptyJeff King2011-12-192-3/+36
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/doc-fsck' into maintJunio C Hamano2011-12-281-18/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | docs: brush up obsolete bits of git-fsck manpagejk/doc-fsckJeff King2011-12-161-18/+8
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maintJunio C Hamano2011-12-281-10/+50
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | lf_to_crlf_filter(): resurrect CRLF->CRLF hackjc/maint-lf-to-crlf-keep-crlfJunio C Hamano2011-12-181-10/+50
* | | | | | | | | | | Merge branch 'ef/setenv-putenv' into maintJunio C Hamano2011-12-281-2/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | compat/setenv.c: error if name contains '='ef/setenv-putenvErik Faye-Lund2011-12-141-1/+1
| * | | | | | | | | | | compat/setenv.c: update errno when erroring outErik Faye-Lund2011-12-141-2/+8
* | | | | | | | | | | | Merge branch 'jc/advice-doc' into maintJunio C Hamano2011-12-281-11/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | advice: Document that they all default to truejc/advice-docJunio C Hamano2011-12-181-11/+8
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jn/maint-sequencer-fixes' into maintJunio C Hamano2011-12-286-126/+252
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | revert: stop creating and removing sequencer-old directoryjn/maint-sequencer-fixesJonathan Nieder2011-12-123-21/+7
| * | | | | | | | | | | | Revert "reset: Make reset remove the sequencer state"Jonathan Nieder2011-12-123-55/+1
| * | | | | | | | | | | | revert: do not remove state until sequence is finishedJonathan Nieder2011-12-122-14/+4
| * | | | | | | | | | | | revert: allow single-pick in the middle of cherry-pick sequenceJonathan Nieder2011-12-122-0/+38
| * | | | | | | | | | | | revert: pass around rev-list args in already-parsed formJonathan Nieder2011-12-122-24/+34
| * | | | | | | | | | | | revert: allow cherry-pick --continue to commit before resumingJonathan Nieder2011-12-122-6/+156
| * | | | | | | | | | | | revert: give --continue handling its own functionJonathan Nieder2011-12-121-11/+17
* | | | | | | | | | | | | Merge branch 'jk/maint-snprintf-va-copy' into maintJunio C Hamano2011-12-281-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | compat/snprintf: don't look at va_list twicejk/maint-snprintf-va-copyJeff King2011-12-121-2/+7
* | | | | | | | | | | | | | Merge branch 'jk/maint-push-over-dav' into maintJunio C Hamano2011-12-287-5/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | http-push: enable "proactive auth"jk/maint-push-over-davJeff King2011-12-136-6/+13
| * | | | | | | | | | | | | | t5540: test DAV push with authenticationJeff King2011-12-132-0/+37
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/maint-mv' into maintJunio C Hamano2011-12-282-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | mv: be quiet about overwritingjk/maint-mvJeff King2011-12-121-1/+2
| * | | | | | | | | | | | | | mv: improve overwrite warningJeff King2011-12-121-1/+1
| * | | | | | | | | | | | | | mv: make non-directory destination error more clearJeff King2011-12-121-1/+1