summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wt-status: simplify building of summary limit argumentrs/status-code-clean-upRené Scharfe2014-06-291-3/+1
* wt-status: use argv_array for environmentRené Scharfe2014-06-291-5/+4
* Git 2.0.1v2.0.1Junio C Hamano2014-06-254-3/+119
* Merge branch 'na/no-http-test-in-the-middle' into maintJunio C Hamano2014-06-252-59/+100
|\
| * t5538: move http push tests out to t5542na/no-http-test-in-the-middleNick Alcock2014-05-302-59/+100
* | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-255-8/+108
|\ \
| * | commit -m: commit staged submodules regardless of ignore configjl/status-added-submodule-is-never-ignoredJens Lehmann2014-04-072-3/+17
| * | status/commit: show staged submodules regardless of ignore configJens Lehmann2014-04-074-6/+92
* | | Merge branch 'ym/fix-opportunistic-index-update-race' into maintJunio C Hamano2014-06-256-5/+90
|\ \ \
| * | | read-cache.c: verify index file before we opportunistically update itym/fix-opportunistic-index-update-raceYiannis Marangos2014-04-103-1/+69
| * | | wrapper.c: add xpread() similar to xread()Yiannis Marangos2014-04-104-4/+21
* | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maintJunio C Hamano2014-06-254-11/+15
|\ \ \ \
| * | | | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-mergesMax Kirillov2014-05-154-11/+15
| |/ / /
* | | | Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano2014-06-253-3/+27
|\ \ \ \
| * | | | rebase -i: test "Nothing to do" case with autostashrr/rebase-autostash-fixMatthieu Moy2014-05-201-0/+15
| * | | | rebase -i: handle "Nothing to do" case with autostashRamkumar Ramachandra2014-05-192-3/+12
* | | | | Merge branch 'jc/shortlog-ref-exclude' into maintJunio C Hamano2014-06-252-0/+7
|\ \ \ \ \
| * | | | | shortlog: allow --exclude=<glob> to be passedjc/shortlog-ref-excludeJunio C Hamano2014-06-042-0/+7
* | | | | | Merge branch 'jl/remote-rm-prune' into maintJunio C Hamano2014-06-253-9/+52
|\ \ \ \ \ \
| * | | | | | remote prune: optimize "dangling symref" check/warningjl/remote-rm-pruneJens Lindström2014-05-273-2/+25
| * | | | | | remote: repack packed-refs once when deleting multiple refsJens Lindström2014-05-273-3/+21
| * | | | | | remote rm: delete remote configuration as the lastJens Lindström2014-05-231-4/+6
* | | | | | | Merge branch 'fc/rerere-conflict-style' into maintJunio C Hamano2014-06-251-0/+2
|\ \ \ \ \ \ \
| * | | | | | | rerere: fix for merge.conflictstylefc/rerere-conflict-styleFelipe Contreras2014-04-301-0/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'rs/pack-objects-no-unnecessary-realloc' into maintJunio C Hamano2014-06-251-2/+2
|\ \ \ \ \ \ \
| * | | | | | | pack-objects: use free()+xcalloc() instead of xrealloc()+memset()rs/pack-objects-no-unnecessary-reallocRené Scharfe2014-06-021-2/+2
* | | | | | | | Merge branch 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano2014-06-253-1/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | mv: allow renaming to fix case on case insensitive filesystemsdt/merge-recursive-case-insensitiveDavid Turner2014-05-082-2/+3
| * | | | | | | | merge-recursive.c: fix case-changing merge bugDavid Turner2014-05-072-0/+59
* | | | | | | | | Merge branch 'rs/mailinfo-header-cmp' into maintJunio C Hamano2014-06-251-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mailinfo: use strcmp() for string comparisonrs/mailinfo-header-cmpRené Scharfe2014-06-021-3/+3
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/index-pack-report-missing' into maintJunio C Hamano2014-06-251-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | index-pack: distinguish missing objects from type errorsjk/index-pack-report-missingJeff King2014-05-121-2/+7
* | | | | | | | | | Merge branch 'nd/index-pack-one-fd-per-thread' into maintJunio C Hamano2014-06-253-18/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | index-pack: work around thread-unsafe pread()nd/index-pack-one-fd-per-threadNguyễn Thái Ngọc Duy2014-04-163-18/+17
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maintJunio C Hamano2014-06-251-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git grep -O -i: if the pager is 'less', pass the '-I' optionsk/spawn-less-case-insensitively-from-grep-O-iJohannes Schindelin2014-05-151-0/+3
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/daemonize-gc' into maintJunio C Hamano2014-06-251-6/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gc --auto: do not lock refs in the backgroundnd/daemonize-gcNguyễn Thái Ngọc Duy2014-05-271-6/+20
* | | | | | | | | | | Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano2014-06-252-6/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | move "--follow needs one pathspec" rule to diff_setup_donejk/diff-follow-must-take-one-pathspecJeff King2014-05-202-6/+5
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/diff-files-assume-unchanged' into maintJunio C Hamano2014-06-252-12/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | run_diff_files: do not look at uninitialized stat datajk/diff-files-assume-unchangedJeff King2014-05-152-12/+32
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-252-4/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit: do not complain of empty messages from -Cjk/commit-C-pick-emptyJeff King2014-04-282-4/+12
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-252-1/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-testbrian m. carlson2014-05-082-1/+9
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jx/blame-align-relative-time' into maintJunio C Hamano2014-06-251-8/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: dynamic blame_date_width for different localesjx/blame-align-relative-timeJiang Xin2014-04-231-1/+8
| * | | | | | | | | | | blame: fix broken time_buf paddings in relative timestampJiang Xin2014-04-231-7/+14