summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/pretty-G-format-fixes' into maintJunio C Hamano2014-07-162-9/+68
|\
| * move "%G" format test from t7510 to t6006Jeff King2014-06-262-6/+6
| * pretty: avoid reading past end-of-string with "%G"Jeff King2014-06-171-0/+6
| * t7510: check %G* pretty-format outputJeff King2014-06-171-0/+40
| * t7510: test a commit signed by an unknown keyJeff King2014-06-171-0/+13
| * t7510: use consistent &&-chains in loopMichael J Gruber2014-06-171-6/+6
| * t7510: stop referring to master in later testsJeff King2014-06-171-3/+3
* | Merge branch 'bc/fix-rebase-merge-skip' into maintJunio C Hamano2014-07-161-0/+15
|\ \
| * | rebase--merge: fix --skip with two conflicts in a rowbrian m. carlson2014-06-161-0/+15
| * | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-291-3/+3
| |\ \
| * \ \ Merge branch 'mw/symlinks' into maintJunio C Hamano2014-05-292-0/+38
| |\ \ \
| * \ \ \ Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-081-22/+22
| |\ \ \ \
| * \ \ \ \ Merge branch 'km/avoid-bs-in-shell-glob' into maintJunio C Hamano2014-05-081-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'km/avoid-cp-a' into maintJunio C Hamano2014-05-081-2/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'pb/trim-trailing-spaces' into maintJunio C Hamano2014-07-101-0/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | t0008: do not depend on 'echo' handling backslashes speciallyJunio C Hamano2014-06-131-6/+8
| * | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequencePasha Bolokhov2014-06-031-0/+23
* | | | | | | | | Merge branch 'jk/repack-pack-keep-objects' into maintJunio C Hamano2014-07-101-2/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | repack: respect pack.writebitmapsJeff King2014-06-101-1/+17
| * | | | | | | | | repack: do not accidentally pack kept objects by defaultJeff King2014-06-101-1/+1
* | | | | | | | | | Merge branch 'maint-1.8.5' into maintJunio C Hamano2014-07-021-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t7300: repair filesystem permissions with test_when_finishedJeff King2014-07-021-2/+2
* | | | | | | | | | | Merge branch 'na/no-http-test-in-the-middle' into maintJunio C Hamano2014-06-252-59/+100
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5538: move http push tests out to t5542Nick Alcock2014-05-302-59/+100
* | | | | | | | | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-251-2/+72
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | commit -m: commit staged submodules regardless of ignore configJens Lehmann2014-04-071-1/+1
| * | | | | | | | | | | | status/commit: show staged submodules regardless of ignore configJens Lehmann2014-04-071-2/+72
* | | | | | | | | | | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maintJunio C Hamano2014-06-253-10/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-show: fix 'git show -s' to not add extra terminator after merge commitMax Kirillov2014-05-153-10/+13
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano2014-06-251-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rebase -i: test "Nothing to do" case with autostashMatthieu Moy2014-05-201-0/+15
* | | | | | | | | | | | | | Merge branch 'jc/shortlog-ref-exclude' into maintJunio C Hamano2014-06-251-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | shortlog: allow --exclude=<glob> to be passedJunio C Hamano2014-06-041-0/+6
* | | | | | | | | | | | | | | Merge branch 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano2014-06-251-0/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | mv: allow renaming to fix case on case insensitive filesystemsDavid Turner2014-05-081-1/+1
| * | | | | | | | | | | | | | | merge-recursive.c: fix case-changing merge bugDavid Turner2014-05-071-0/+53
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-097-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cn/fetch-prune-overlapping-destination' into maintJunio C Hamano2014-04-091-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-091-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-04-091-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-082-9/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-031-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/lib-terminal-lazy' into maintJunio C Hamano2014-04-031-18/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'us/printf-not-echo' into maintJunio C Hamano2014-04-031-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/wt-status' into maintJunio C Hamano2014-04-032-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-files-assume-unchanged' into maintJunio C Hamano2014-06-251-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | run_diff_files: do not look at uninitialized stat dataJeff King2014-05-151-0/+11
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-251-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | commit: do not complain of empty messages from -CJeff King2014-04-281-1/+10
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-251-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \