summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | git-p4: explicitly specify that HEAD is a revisionVlad Dogaru2014-04-071-1/+1
* | | | | | | | | | | | | | | | | | | MSVC: allow using ExtUtils::MakeMakerMarat Radchenko2014-04-041-1/+0
* | | | | | | | | | | | | | | | | | | Update draft release notes to 2.0Junio C Hamano2014-04-031-0/+25
* | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2014-04-031-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Start preparing for 1.9.1Junio C Hamano2014-04-032-1/+39
| * | | | | | | | | | | | | | | | | | Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-032-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/remove-subtree-long-pathname-fix' into maintJunio C Hamano2014-04-031-32/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/lib-terminal-lazy' into maintJunio C Hamano2014-04-031-18/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-031-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'us/printf-not-echo' into maintJunio C Hamano2014-04-032-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/doc-merge-strategies' into maintJunio C Hamano2014-04-031-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano2014-04-035-56/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/stash-pop-not-popped' into maintJunio C Hamano2014-04-031-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/wt-status' into maintJunio C Hamano2014-04-033-55/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/gc-aggressive'Junio C Hamano2014-04-035-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | environment.c: fix constness for odb_pack_keep()nd/gc-aggressiveNguyễn Thái Ngọc Duy2014-03-312-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | gc --aggressive: make --depth configurableNguyễn Thái Ngọc Duy2014-03-313-1/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fix-diff-no-index-diff-opt-parse'Junio C Hamano2014-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | diff-no-index: correctly diagnose error return from diff_opt_parse()jc/fix-diff-no-index-diff-opt-parseJunio C Hamano2014-03-311-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/aix'Junio C Hamano2014-04-033-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | tests: don't rely on strerror text when testing rmdir failurecb/aixCharles Bailey2014-03-312-4/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c: make git_fnmatch() not inlineCharles Bailey2014-03-311-3/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune-overlapping-destination'Junio C Hamano2014-04-032-6/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | fetch: handle overlaping refspecs on --prunecn/fetch-prune-overlapping-destinationCarlos Martín Nieto2014-03-262-7/+45
| * | | | | | | | | | | | | | | | | | | | | | | | | | fetch: add a failing test for prunning with overlapping refspecsCarlos Martín Nieto2014-02-281-0/+20
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/log-show-linear-break'Junio C Hamano2014-04-0314-11/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | log: add --show-linear-break to help see non-linear historynd/log-show-linear-breakNguyễn Thái Ngọc Duy2014-03-255-5/+66
| * | | | | | | | | | | | | | | | | | | | | | | | | | object.h: centralize object flag allocationNguyễn Thái Ngọc Duy2014-03-2511-7/+24