summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* commit.c: check for lock error and return earlyrs/ref-update-check-errors-earlyRonnie Sahlberg2014-04-171-4/+4
* sequencer.c: check for lock failure and bail early in fast_forward_toRonnie Sahlberg2014-04-171-0/+4
* Update draft release notes for 2.0Junio C Hamano2014-04-161-0/+11
* Merge branch 'mh/multimail'Junio C Hamano2014-04-165-56/+249
|\
| * git-multimail: update to version 1.0.0mh/multimailMichael Haggerty2014-04-075-56/+249
* | Merge branch 'tb/unicode-6.3-zero-width'Junio C Hamano2014-04-161-5/+4
|\ \
| * | utf8.c: partially update to version 6.3Torsten Bögershausen2014-04-091-5/+4
| |/
* | Merge branch 'km/avoid-cp-a'Junio C Hamano2014-04-161-2/+2
|\ \
| * | test: fix t7001 cp to use POSIX optionskm/avoid-cp-aKyle J. McKay2014-04-111-2/+2
* | | Merge branch 'km/avoid-bs-in-shell-glob'Junio C Hamano2014-04-161-2/+2
|\ \ \
| * | | test: fix t5560 on FreeBSDkm/avoid-bs-in-shell-globKyle J. McKay2014-04-111-2/+2
| |/ /
* | | Sync with 1.9.2Junio C Hamano2014-04-093-2/+23
|\ \ \
| * | | Git 1.9.2v1.9.2Junio C Hamano2014-04-093-2/+23
| * | | Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-0957-90/+88
| |\ \ \
| * \ \ \ Merge branch 'cn/fetch-prune-overlapping-destination' into maintJunio C Hamano2014-04-092-6/+64
| |\ \ \ \
| * \ \ \ \ Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-092-0/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-04-095-4/+47
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maintJunio C Hamano2014-04-091-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'doc/http-backend: missing accent grave in literal mark-up'Junio C Hamano2014-04-091-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | doc/http-backend: missing accent grave in literal mark-upThomas Ackermann2014-04-091-1/+1
* | | | | | | | | | Update draft release notes to 2.0Junio C Hamano2014-04-081-17/+11
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2014-04-081-0/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Update draft release notes to 1.9.2Junio C Hamano2014-04-081-0/+9
| * | | | | | | | | Merge branch 'mm/status-porcelain-format-i18n-fix' into maintJunio C Hamano2014-04-082-5/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-0810-39/+137
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-bitmap'Junio C Hamano2014-04-086-6/+56
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: do not reuse packfiles without --delta-base-offsetJeff King2014-04-041-1/+12
| * | | | | | | | | | | | add `ignore_missing_links` mode to revwalkVicent Marti2014-04-045-5/+44
* | | | | | | | | | | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-0857-90/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-3112-16/+16
| * | | | | | | | | | | | comments: fix misuses of "nor"Justin Lebar2014-03-3120-27/+26
| * | | | | | | | | | | | contrib: fix misuses of "nor"Justin Lebar2014-03-312-3/+3
| * | | | | | | | | | | | Documentation: fix misuses of "nor"Justin Lebar2014-03-3125-44/+43
* | | | | | | | | | | | | Merge branch 'mh/update-ref-batch-create-fix'Junio C Hamano2014-04-082-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | update-ref: fail create operation over stdin if ref already existsmh/update-ref-batch-create-fixAman Gupta2014-04-022-0/+12
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mr/opt-set-ptr'Junio C Hamano2014-04-085-19/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | parse-options: remove unused OPT_SET_PTRmr/opt-set-ptrMarat Radchenko2014-03-315-19/+4
| * | | | | | | | | | | | parse-options: add cast to correct pointer type to OPT_SET_PTRJunio C Hamano2014-03-312-2/+2
| * | | | | | | | | | | | MSVC: fix t0040-parse-options crashMarat Radchenko2014-03-311-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ib/rev-parse-parseopt-argh'Junio C Hamano2014-04-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rev-parse: fix typo in example on manpageib/rev-parse-parseopt-arghRené Scharfe2014-04-011-1/+1
* | | | | | | | | | | | | Merge branch 'mr/msvc-link-with-invalidcontinue'Junio C Hamano2014-04-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | MSVC: link in invalidcontinue.obj for better POSIX compatibilitymr/msvc-link-with-invalidcontinueMarat Radchenko2014-03-281-1/+1
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano2014-04-0817-29/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | parse-options: make sure argh string does not have SP or _Junio C Hamano2014-03-241-0/+3
| * | | | | | | | | | | | | update-index: teach --cacheinfo a new syntax "mode,sha1,path"Junio C Hamano2014-03-243-5/+50
| * | | | | | | | | | | | | parse-options: multi-word argh should use dash to separate wordsJunio C Hamano2014-03-2413-24/+24
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/commit-dates-parsing-fix'Junio C Hamano2014-04-085-4/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | t4212: loosen far-in-future test for AIXjk/commit-dates-parsing-fixJeff King2014-04-011-4/+2
| * | | | | | | | | | | | date: recognize bogus FreeBSD gmtime outputJeff King2014-04-014-0/+45