summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* blame: new option --prefer-first to better handle merged cherry-picksbl/blame-full-historyBernhard R. Link2014-01-142-2/+11
* Sync with 1.8.5.3Junio C Hamano2014-01-133-3/+31
|\
| * Git 1.8.5.3v1.8.5.3Junio C Hamano2014-01-134-3/+31
| * Merge branch 'nd/daemon-informative-errors-typofix' into maintJunio C Hamano2014-01-131-2/+2
| |\
| * \ Merge branch 'km/gc-eperm' into maintJunio C Hamano2014-01-131-1/+1
| |\ \
| * \ \ Merge branch 'jk/credential-plug-leak' into maintJunio C Hamano2014-01-131-1/+2
| |\ \ \
| * \ \ \ Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maintJunio C Hamano2014-01-132-7/+47
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/rev-parse-double-dashes' into maintJunio C Hamano2014-01-132-1/+39
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/cat-file-regression-fix' into maintJunio C Hamano2014-01-132-10/+42
| |\ \ \ \ \ \
| * | | | | | | pack-heuristics.txt: mark up the file header properlyThomas Ackermann2014-01-131-2/+2
* | | | | | | | Update draft release notes to 1.9Junio C Hamano2014-01-131-0/+15
* | | | | | | | Merge branch 'jk/t5531-prepare-to-default-to-non-matching'Junio C Hamano2014-01-131-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t5531: further "matching" fixupsjk/t5531-prepare-to-default-to-non-matchingJeff King2014-01-131-0/+1
* | | | | | | | | Merge branch 'sb/diff-orderfile-config'Junio C Hamano2014-01-131-4/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff test: reading a directory as a file need not error outsb/diff-orderfile-configJonathan Nieder2014-01-101-4/+0
* | | | | | | | | | Merge branch 'mh/shorten-unambigous-ref'Junio C Hamano2014-01-131-31/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | shorten_unambiguous_ref(): tighten up pointer arithmeticmh/shorten-unambigous-refMichael Haggerty2014-01-091-2/+2
| * | | | | | | | | | gen_scanf_fmt(): delete function and use snprintf() insteadMichael Haggerty2014-01-091-26/+9
| * | | | | | | | | | shorten_unambiguous_ref(): introduce a new local variableMichael Haggerty2014-01-091-4/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mm/mv-file-to-no-such-dir-with-slash'Junio C Hamano2014-01-131-0/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | mv: let 'git mv file no-such-dir/' error out on Windows, toomm/mv-file-to-no-such-dir-with-slashJohannes Sixt2014-01-101-0/+2
* | | | | | | | | | Merge branch 'jl/submodule-mv-checkout-caveat'Junio C Hamano2014-01-134-0/+58
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rm: better document side effects when removing a submodulejl/submodule-mv-checkout-caveatJens Lehmann2014-01-072-0/+25
| * | | | | | | | | | mv: better document side effects when moving a submoduleJens Lehmann2014-01-072-0/+33
* | | | | | | | | | | Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano2014-01-132-3/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase: fix fork-point with zero argumentsJohn Keeping2014-01-092-3/+12
* | | | | | | | | | | | Merge branch 'rr/completion-format-coverletter'Junio C Hamano2014-01-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | completion: complete format.coverLetterrr/completion-format-coverletterRamkumar Ramachandra2014-01-071-0/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ow/stash-with-ifs'Junio C Hamano2014-01-132-7/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | stash: handle specifying stashes with $IFSow/stash-with-ifsØystein Walle2014-01-072-7/+19
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jn/pager-lv-default-env'Junio C Hamano2014-01-135-3/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pager: set LV=-c alongside LESS=FRSXJonathan Nieder2014-01-075-3/+28
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'br/sha1-name-40-hex-no-disambiguation'Junio C Hamano2014-01-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | sha1_name: don't resolve refs when core.warnambiguousrefs is falsebr/sha1-name-40-hex-no-disambiguationBrodie Rao2014-01-071-2/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Update draft release notes to 1.9Junio C Hamano2014-01-101-1/+114
* | | | | | | | | | | | Merge branch 'ss/builtin-cleanup'Junio C Hamano2014-01-104-125/+143
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | builtin/help.c: speed up is_git_command() by checking for builtin commands firstss/builtin-cleanupSebastian Schuberth2014-01-064-117/+134
| * | | | | | | | | | | | builtin/help.c: call load_command_list() only when it is neededSebastian Schuberth2014-01-061-1/+2
| * | | | | | | | | | | | git.c: consistently use the term "builtin" instead of "internal command"Sebastian Schuberth2014-01-062-8/+8
* | | | | | | | | | | | | Merge branch 'vm/octopus-merge-bases-simplify'Junio C Hamano2014-01-101-18/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | get_octopus_merge_bases(): cleanup redundant variablevm/octopus-merge-bases-simplifyVasily Makarov2014-01-031-18/+18
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ta/format-user-manual-as-an-article'Junio C Hamano2014-01-102-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | user-manual: improve html and pdf formattingta/format-user-manual-as-an-articleThomas Ackermann2014-01-062-2/+2
* | | | | | | | | | | | | | Merge branch 'rr/completion-branch-config'Junio C Hamano2014-01-102-5/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | completion: fix remote.pushdefaultrr/completion-branch-configRamkumar Ramachandra2014-01-061-0/+1
| * | | | | | | | | | | | | | completion: fix branch.autosetup(merge|rebase)Ramkumar Ramachandra2014-01-061-0/+1
| * | | | | | | | | | | | | | completion: introduce __gitcomp_nl_append ()Ramkumar Ramachandra2014-01-062-4/+26
| * | | | | | | | | | | | | | zsh completion: find matching custom bash completionRamkumar Ramachandra2014-01-061-1/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'js/lift-parent-count-limit'Junio C Hamano2014-01-104-10/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove the line length limit for graft filesjs/lift-parent-count-limitJohannes Schindelin2013-12-274-10/+45