aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'maint-1.8.5' into maintJunio C Hamano2014-07-02
|\
| * enums: remove trailing ',' after last item in enumRonnie Sahlberg2014-07-02
* | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-25
|\ \
| * | commit -m: commit staged submodules regardless of ignore configJens Lehmann2014-04-07
* | | Merge branch 'ym/fix-opportunistic-index-update-race' into maintJunio C Hamano2014-06-25
|\ \ \
| * | | wrapper.c: add xpread() similar to xread()Yiannis Marangos2014-04-10
| | |/ | |/|
* | | Merge branch 'jl/remote-rm-prune' into maintJunio C Hamano2014-06-25
|\ \ \
| * | | remote prune: optimize "dangling symref" check/warningJens Lindström2014-05-27
| * | | remote: repack packed-refs once when deleting multiple refsJens Lindström2014-05-27
| * | | remote rm: delete remote configuration as the lastJens Lindström2014-05-23
* | | | Merge branch 'fc/rerere-conflict-style' into maintJunio C Hamano2014-06-25
|\ \ \ \
| * | | | rerere: fix for merge.conflictstyleFelipe Contreras2014-04-30
| | |/ / | |/| |
* | | | Merge branch 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano2014-06-25
|\ \ \ \
| * | | | mv: allow renaming to fix case on case insensitive filesystemsDavid Turner2014-05-08
* | | | | Merge branch 'rs/mailinfo-header-cmp' into maintJunio C Hamano2014-06-25
|\ \ \ \ \
| * | | | | mailinfo: use strcmp() for string comparisonRené Scharfe2014-06-02
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/index-pack-report-missing' into maintJunio C Hamano2014-06-25
|\ \ \ \ \
| * | | | | index-pack: distinguish missing objects from type errorsJeff King2014-05-12
| | |/ / / | |/| | |
| * | | | Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-09
| |\ \ \ \
| * \ \ \ \ Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-09
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-08
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-03
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-03
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano2014-04-03
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-one-fd-per-thread' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-pack: work around thread-unsafe pread()Nguyễn Thái Ngọc Duy2014-04-16
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git grep -O -i: if the pager is 'less', pass the '-I' optionJohannes Schindelin2014-05-15
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nd/daemonize-gc' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gc --auto: do not lock refs in the backgroundNguyễn Thái Ngọc Duy2014-05-27
* | | | | | | | | | | | Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | move "--follow needs one pathspec" rule to diff_setup_doneJeff King2014-05-20
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | commit: do not complain of empty messages from -CJeff King2014-04-28
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | blame: correctly handle files regardless of autocrlfbrian m. carlson2014-05-08
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jx/blame-align-relative-time' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | blame: dynamic blame_date_width for different localesJiang Xin2014-04-23
| * | | | | | | | | | | | blame: fix broken time_buf paddings in relative timestampJiang Xin2014-04-23
* | | | | | | | | | | | | Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | apply --ignore-space-change: lines with and without leading whitespaces do no...Junio C Hamano2014-03-26
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maintJunio C Hamano2014-06-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | update-index: fix segfault with missing --cacheinfo argumentJeff King2014-06-04
* | | | | | | | | | | | | i18n: only extract comments marked with "TRANSLATORS:"Jiang Xin2014-04-17
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-04-08
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: do not reuse packfiles without --delta-base-offsetJeff King2014-04-04
* | | | | | | | | | | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | code and test: fix misuses of "nor"Justin Lebar2014-03-31
| * | | | | | | | | | | | comments: fix misuses of "nor"Justin Lebar2014-03-31
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-18
| |\ \ \ \ \ \ \ \ \ \ \