Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dt/merge-recursive-case-insensitive' into maint | Junio C Hamano | 2014-06-25 | 3 | -1/+61 |
|\ | |||||
| * | mv: allow renaming to fix case on case insensitive filesystems | David Turner | 2014-05-08 | 2 | -2/+3 |
| * | merge-recursive.c: fix case-changing merge bug | David Turner | 2014-05-07 | 2 | -0/+59 |
* | | Merge branch 'rs/mailinfo-header-cmp' into maint | Junio C Hamano | 2014-06-25 | 1 | -3/+3 |
|\ \ | |||||
| * | | mailinfo: use strcmp() for string comparison | René Scharfe | 2014-06-02 | 1 | -3/+3 |
* | | | Merge branch 'jk/index-pack-report-missing' into maint | Junio C Hamano | 2014-06-25 | 1 | -2/+7 |
|\ \ \ | |||||
| * | | | index-pack: distinguish missing objects from type errors | Jeff King | 2014-05-12 | 1 | -2/+7 |
* | | | | Merge branch 'nd/index-pack-one-fd-per-thread' into maint | Junio C Hamano | 2014-06-25 | 3 | -18/+17 |
|\ \ \ \ | |||||
| * | | | | index-pack: work around thread-unsafe pread() | Nguyễn Thái Ngọc Duy | 2014-04-16 | 3 | -18/+17 |
* | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maint | Junio C Hamano | 2014-06-25 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | git grep -O -i: if the pager is 'less', pass the '-I' option | Johannes Schindelin | 2014-05-15 | 1 | -0/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'nd/daemonize-gc' into maint | Junio C Hamano | 2014-06-25 | 1 | -6/+20 |
|\ \ \ \ \ | |||||
| * | | | | | gc --auto: do not lock refs in the background | Nguyễn Thái Ngọc Duy | 2014-05-27 | 1 | -6/+20 |
* | | | | | | Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint | Junio C Hamano | 2014-06-25 | 2 | -6/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | move "--follow needs one pathspec" rule to diff_setup_done | Jeff King | 2014-05-20 | 2 | -6/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/diff-files-assume-unchanged' into maint | Junio C Hamano | 2014-06-25 | 2 | -12/+32 |
|\ \ \ \ \ \ | |||||
| * | | | | | | run_diff_files: do not look at uninitialized stat data | Jeff King | 2014-05-15 | 2 | -12/+32 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/commit-C-pick-empty' into maint | Junio C Hamano | 2014-06-25 | 2 | -4/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | commit: do not complain of empty messages from -C | Jeff King | 2014-04-28 | 2 | -4/+12 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'bc/blame-crlf-test' into maint | Junio C Hamano | 2014-06-25 | 2 | -1/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | blame: correctly handle files regardless of autocrlf | brian m. carlson | 2014-05-08 | 2 | -1/+9 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jx/blame-align-relative-time' into maint | Junio C Hamano | 2014-06-25 | 1 | -8/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | blame: dynamic blame_date_width for different locales | Jiang Xin | 2014-04-23 | 1 | -1/+8 |
| * | | | | | | blame: fix broken time_buf paddings in relative timestamp | Jiang Xin | 2014-04-23 | 1 | -7/+14 |
* | | | | | | | Merge branch 'jc/apply-ignore-whitespace' into maint | Junio C Hamano | 2014-06-25 | 2 | -13/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | apply --ignore-space-change: lines with and without leading whitespaces do no... | Junio C Hamano | 2014-03-26 | 2 | -13/+11 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/complete-merge-pull' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | completion: add missing options for git-merge | John Keeping | 2014-05-27 | 1 | -1/+4 |
| * | | | | | | | completion: add a note that merge options are shared | John Keeping | 2014-05-27 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'ow/config-mailmap-pathname' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: respect '~' and '~user' in mailmap.file | Øystein Walle | 2014-05-27 | 1 | -1/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'as/pretty-truncate' into maint | Junio C Hamano | 2014-06-25 | 5 | -72/+282 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | pretty.c: format string with truncate respects logOutputEncoding | Alexey Shumkin | 2014-05-21 | 3 | -8/+13 |
| * | | | | | | | | t4205, t6006: add tests that fail with i18n.logOutputEncoding set | Alexey Shumkin | 2014-05-21 | 2 | -2/+213 |
| * | | | | | | | | t4205 (log-pretty-format): use `tformat` rather than `format` | Alexey Shumkin | 2014-05-21 | 1 | -39/+13 |
| * | | | | | | | | t4041, t4205, t6006, t7102: don't hardcode tested encoding value | Alexey Shumkin | 2014-05-21 | 4 | -27/+39 |
| * | | | | | | | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs | Alexey Shumkin | 2014-05-19 | 1 | -3/+11 |
* | | | | | | | | | Merge branch 'jc/revision-dash-count-parsing' into maint | Junio C Hamano | 2014-06-25 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | revision: parse "git log -<count>" more carefully | Junio C Hamano | 2014-06-09 | 1 | -2/+4 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/report-fail-to-read-objects-better' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | open_sha1_file: report "most interesting" errno | Jeff King | 2014-05-15 | 1 | -1/+5 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'mn/sideband-no-ansi' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | sideband.c: do not use ANSI control sequence on non-terminal | Michael Naumov | 2014-06-02 | 1 | -1/+1 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'je/pager-do-not-recurse' into maint | Junio C Hamano | 2014-06-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pager: do allow spawning pager recursively | Jörn Engel | 2014-04-29 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint | Junio C Hamano | 2014-06-12 | 2 | -0/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | update-index: fix segfault with missing --cacheinfo argument | Jeff King | 2014-06-04 | 2 | -0/+7 |
* | | | | | | | | | | pull: do not abuse 'break' inside a shell 'case' | Jacek Konieczny | 2014-06-12 | 1 | -2/+0 |
* | | | | | | | | | | Sync with 1.9.4 | Junio C Hamano | 2014-05-30 | 2 | -1/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Git 1.9.4v1.9.4 | Junio C Hamano | 2014-05-30 | 4 | -3/+20 |