summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.8.5' into maintJunio C Hamano2014-07-021-1/+1
|\
| * enums: remove trailing ',' after last item in enumRonnie Sahlberg2014-07-021-1/+1
* | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-251-2/+16
|\ \
| * | commit -m: commit staged submodules regardless of ignore configjl/status-added-submodule-is-never-ignoredJens Lehmann2014-04-071-2/+16
* | | Merge branch 'ym/fix-opportunistic-index-update-race' into maintJunio C Hamano2014-06-251-1/+1
|\ \ \
| * | | wrapper.c: add xpread() similar to xread()Yiannis Marangos2014-04-101-1/+1
| | |/ | |/|
* | | Merge branch 'jl/remote-rm-prune' into maintJunio C Hamano2014-06-251-7/+30
|\ \ \
| * | | remote prune: optimize "dangling symref" check/warningjl/remote-rm-pruneJens Lindström2014-05-271-1/+6
| * | | remote: repack packed-refs once when deleting multiple refsJens Lindström2014-05-271-2/+18
| * | | 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 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano2014-06-251-1/+2
|\ \ \ \
| * | | | mv: allow renaming to fix case on case insensitive filesystemsdt/merge-recursive-case-insensitiveDavid Turner2014-05-081-1/+2
* | | | | 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 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-096-8/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-091-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-085-17/+38
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-031-0/+9
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-031-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano2014-04-031-12/+4
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-one-fd-per-thread' into maintJunio C Hamano2014-06-251-10/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-pack: work around thread-unsafe pread()nd/index-pack-one-fd-per-threadNguyễn Thái Ngọc Duy2014-04-161-10/+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-251-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | move "--follow needs one pathspec" rule to diff_setup_donejk/diff-follow-must-take-one-pathspecJeff King2014-05-201-6/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-251-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | commit: do not complain of empty messages from -Cjk/commit-C-pick-emptyJeff King2014-04-281-3/+2
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-251-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | blame: correctly handle files regardless of autocrlfbc/blame-crlf-testbrian m. carlson2014-05-081-1/+0
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2014-06-251-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | apply --ignore-space-change: lines with and without leading whitespaces do no...jc/apply-ignore-whitespaceJunio C Hamano2014-03-261-5/+7
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maintJunio C Hamano2014-06-121-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | update-index: fix segfault with missing --cacheinfo argumentjc/rev-parse-argh-dashed-multi-wordsJeff King2014-06-041-0/+3
* | | | | | | | | | | | | i18n: only extract comments marked with "TRANSLATORS:"Jiang Xin2014-04-171-5/+3
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-04-081-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: do not reuse packfiles without --delta-base-offsetJeff King2014-04-041-1/+12
* | | | | | | | | | | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-086-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-312-4/+4
| * | | | | | | | | | | | comments: fix misuses of "nor"Justin Lebar2014-03-314-4/+4
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-181-11/+9
| |\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status