summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder2011-11-282-1/+24
* | | | | | | | | | | | | | | | | | | Merge branch 'na/strtoimax' into maintJunio C Hamano2011-12-284-13/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Support sizes >=2G in various config options accepting 'g' sizes.na/strtoimaxNick Alcock2011-11-051-10/+31
| * | | | | | | | | | | | | | | | | | | Compatibility: declare strtoimax() under NO_STRTOUMAXJohannes Sixt2011-11-051-0/+2
| * | | | | | | | | | | | | | | | | | | Add strtoimax() compatibility function.Nick Alcock2011-11-022-3/+13
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/refresh-porcelain-output' into maintJunio C Hamano2011-12-281-10/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | refresh_index: make porcelain output more specificjk/refresh-porcelain-outputJeff King2011-11-181-2/+21
| * | | | | | | | | | | | | | | | | | | | refresh_index: rename format variablesJeff King2011-11-181-6/+6
| * | | | | | | | | | | | | | | | | | | | read-cache: let refresh_cache_ent pass up changed flagsJeff King2011-11-181-3/+6
* | | | | | | | | | | | | | | | | | | | | Git 1.7.8.1v1.7.8.1Junio C Hamano2011-12-211-4/+25
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jl/submodule-status-failure-report' into maintJunio C Hamano2011-12-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | diff/status: print submodule path when looking for changes failsjl/submodule-status-failure-reportJens Lehmann2011-12-081-2/+2
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/userdiff-c-returns-pointer' into maintJunio C Hamano2011-12-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | userdiff: allow * between cpp funcname wordstr/userdiff-c-returns-pointerThomas Rast2011-12-061-1/+1