Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jl/status-added-submodule-is-never-ignored' into maint | Junio C Hamano | 2014-06-25 |
|\ | |||
| * | commit -m: commit staged submodules regardless of ignore config | Jens Lehmann | 2014-04-07 |
* | | Merge branch 'ym/fix-opportunistic-index-update-race' into maint | Junio C Hamano | 2014-06-25 |
|\ \ | |||
| * | | wrapper.c: add xpread() similar to xread() | Yiannis Marangos | 2014-04-10 |
* | | | Merge branch 'jl/remote-rm-prune' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ | |||
| * | | | remote prune: optimize "dangling symref" check/warning | Jens Lindström | 2014-05-27 |
| * | | | remote: repack packed-refs once when deleting multiple refs | Jens Lindström | 2014-05-27 |
| * | | | remote rm: delete remote configuration as the last | Jens Lindström | 2014-05-23 |
* | | | | Merge branch 'fc/rerere-conflict-style' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ | |||
| * | | | | rerere: fix for merge.conflictstyle | Felipe Contreras | 2014-04-30 |
| | |/ / | |/| | | |||
* | | | | Merge branch 'dt/merge-recursive-case-insensitive' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ | |||
| * | | | | mv: allow renaming to fix case on case insensitive filesystems | David Turner | 2014-05-08 |
* | | | | | Merge branch 'rs/mailinfo-header-cmp' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ | |||
| * | | | | | mailinfo: use strcmp() for string comparison | René Scharfe | 2014-06-02 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'jk/index-pack-report-missing' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ | |||
| * | | | | | index-pack: distinguish missing objects from type errors | Jeff King | 2014-05-12 |
| | |/ / / | |/| | | | |||
| * | | | | Merge branch 'jl/nor-or-nand-and' into maint | Junio C Hamano | 2014-04-09 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'mh/update-ref-batch-create-fix' into maint | Junio C Hamano | 2014-04-09 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'bp/commit-p-editor' into maint | Junio C Hamano | 2014-04-08 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jk/mv-submodules-fix' into maint | Junio C Hamano | 2014-04-03 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-error-message' into maint | Junio C Hamano | 2014-04-03 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/shallow-update-fix' into maint | Junio C Hamano | 2014-04-03 |
| |\ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-one-fd-per-thread' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | index-pack: work around thread-unsafe pread() | Nguyễn Thái Ngọc Duy | 2014-04-16 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | git grep -O -i: if the pager is 'less', pass the '-I' option | Johannes Schindelin | 2014-05-15 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'nd/daemonize-gc' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | gc --auto: do not lock refs in the background | Nguyễn Thái Ngọc Duy | 2014-05-27 |
* | | | | | | | | | | | | Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | move "--follow needs one pathspec" rule to diff_setup_done | Jeff King | 2014-05-20 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | commit: do not complain of empty messages from -C | Jeff King | 2014-04-28 |
| |/ / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge branch 'bc/blame-crlf-test' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | blame: correctly handle files regardless of autocrlf | brian m. carlson | 2014-05-08 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'jx/blame-align-relative-time' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | blame: dynamic blame_date_width for different locales | Jiang Xin | 2014-04-23 |
| * | | | | | | | | | | | | blame: fix broken time_buf paddings in relative timestamp | Jiang Xin | 2014-04-23 |
* | | | | | | | | | | | | | Merge branch 'jc/apply-ignore-whitespace' into maint | Junio C Hamano | 2014-06-25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | apply --ignore-space-change: lines with and without leading whitespaces do no... | Junio C Hamano | 2014-03-26 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint | Junio C Hamano | 2014-06-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | update-index: fix segfault with missing --cacheinfo argument | Jeff King | 2014-06-04 |
* | | | | | | | | | | | | | i18n: only extract comments marked with "TRANSLATORS:" | Jiang Xin | 2014-04-17 |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-04-08 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | pack-objects: do not reuse packfiles without --delta-base-offset | Jeff King | 2014-04-04 |
* | | | | | | | | | | | | | Merge branch 'jl/nor-or-nand-and' | Junio C Hamano | 2014-04-08 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | code and test: fix misuses of "nor" | Justin Lebar | 2014-03-31 |
| * | | | | | | | | | | | | comments: fix misuses of "nor" | Justin Lebar | 2014-03-31 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Merge branch 'jk/clean-d-pathspec' into maint | Junio C Hamano | 2014-03-18 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/reset-setup-worktree' into maint | Junio C Hamano | 2014-03-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/check-attr-honor-working-tree' into maint | Junio C Hamano | 2014-03-18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |