summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano2014-06-253-1/+61
|\
| * mv: allow renaming to fix case on case insensitive filesystemsDavid 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 comparisonRené 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 errorsJeff 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()Nguyễ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' optionJohannes 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 backgroundNguyễ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_doneJeff 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 dataJeff 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 -CJeff 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 autocrlfbrian 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 localesJiang 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-252-13/+11
|\ \ \ \ \ \ \
| * | | | | | | apply --ignore-space-change: lines with and without leading whitespaces do no...Junio C Hamano2014-03-262-13/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/complete-merge-pull' into maintJunio C Hamano2014-06-251-1/+5
|\ \ \ \ \ \ \
| * | | | | | | completion: add missing options for git-mergeJohn Keeping2014-05-271-1/+4
| * | | | | | | completion: add a note that merge options are sharedJohn Keeping2014-05-271-0/+1
* | | | | | | | Merge branch 'ow/config-mailmap-pathname' into maintJunio C Hamano2014-06-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | config: respect '~' and '~user' in mailmap.fileØystein Walle2014-05-271-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'as/pretty-truncate' into maintJunio C Hamano2014-06-255-72/+282
|\ \ \ \ \ \ \ \
| * | | | | | | | pretty.c: format string with truncate respects logOutputEncodingAlexey Shumkin2014-05-213-8/+13
| * | | | | | | | t4205, t6006: add tests that fail with i18n.logOutputEncoding setAlexey Shumkin2014-05-212-2/+213
| * | | | | | | | t4205 (log-pretty-format): use `tformat` rather than `format`Alexey Shumkin2014-05-211-39/+13
| * | | | | | | | t4041, t4205, t6006, t7102: don't hardcode tested encoding valueAlexey Shumkin2014-05-214-27/+39
| * | | | | | | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputsAlexey Shumkin2014-05-191-3/+11
* | | | | | | | | Merge branch 'jc/revision-dash-count-parsing' into maintJunio C Hamano2014-06-251-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | revision: parse "git log -<count>" more carefullyJunio C Hamano2014-06-091-2/+4
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/report-fail-to-read-objects-better' into maintJunio C Hamano2014-06-251-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | open_sha1_file: report "most interesting" errnoJeff King2014-05-151-1/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mn/sideband-no-ansi' into maintJunio C Hamano2014-06-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sideband.c: do not use ANSI control sequence on non-terminalMichael Naumov2014-06-021-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'je/pager-do-not-recurse' into maintJunio C Hamano2014-06-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pager: do allow spawning pager recursivelyJörn Engel2014-04-291-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maintJunio C Hamano2014-06-122-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update-index: fix segfault with missing --cacheinfo argumentJeff King2014-06-042-0/+7
* | | | | | | | | | pull: do not abuse 'break' inside a shell 'case'Jacek Konieczny2014-06-121-2/+0
* | | | | | | | | | Sync with 1.9.4Junio C Hamano2014-05-302-1/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Git 1.9.4v1.9.4Junio C Hamano2014-05-304-3/+20