summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | mv: honor --verbose flagJeff King2011-12-122-2/+7
| * | | | | | docs: mention "-k" for both forms of "git mv"Jeff King2011-12-121-1/+1
* | | | | | | Merge branch 'jk/fetch-no-tail-match-refs' into maintJunio C Hamano2011-12-288-41/+48
|\ \ \ \ \ \ \
| * | | | | | | connect.c: drop path_match functionjk/fetch-no-tail-match-refsJeff King2011-12-132-22/+0
| * | | | | | | fetch-pack: match refs exactlyJeff King2011-12-132-4/+38
| * | | | | | | t5500: give fully-qualified refs to fetch-packJeff King2011-12-131-3/+3
| * | | | | | | drop "match" parameter from get_remote_headsJeff King2011-12-136-12/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ew/keepalive' into maintJunio C Hamano2011-12-281-0/+13
|\ \ \ \ \ \ \
| * | | | | | | enable SO_KEEPALIVE for connected TCP socketsEric Wong2011-12-051-0/+13
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ci/stripspace-docs' into maintJunio C Hamano2011-12-282-7/+64
|\ \ \ \ \ \ \
| * | | | | | | Update documentation for stripspaceci/stripspace-docsConrad Irwin2011-12-122-7/+64
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jh/fast-import-notes' into maintJunio C Hamano2011-12-282-8/+83
|\ \ \ \ \ \ \
| * | | | | | | fast-import: Fix incorrect fanout level when modifying existing notes refsjh/fast-import-notesJohan Herland2011-11-282-7/+29
| * | | | | | | t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handlingJohan Herland2011-11-281-0/+54
| * | | | | | | t9301: Fix testcase covering up a bug in fast-import's notes fanout handlingJohan Herland2011-11-281-7/+6
* | | | | | | | Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maintJunio C Hamano2011-12-281-13/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase -i: interrupt rebase when "commit --amend" failed during "reword"aw/rebase-i-stop-on-failure-to-amendAndrew Wong2011-11-301-13/+23
* | | | | | | | | Merge branch 'tj/maint-imap-send-remove-unused' into maintJunio C Hamano2011-12-281-1/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'maint' into tj/imap-send-remove-unusedtj/maint-imap-send-remove-unusedJunio C Hamano2011-11-232374-58531/+446169
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | imap-send: Remove unused 'use_namespace' variableThomas Jarosch2011-11-231-1/+0
* | | | | | | | | | Merge branch 'jn/branch-move-to-self' into maintJunio C Hamano2011-12-286-13/+47
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-selfJonathan Nieder2011-11-285-12/+23