summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* rebase: pass --[no-]signoff option to git amgb/rebase-signoffGiuseppe Bilotta2017-04-181-0/+46
* Merge branch 'ls/filter-process' into maintJunio C Hamano2017-01-172-26/+15
|\
| * t0021: fix flaky testls/filter-processLars Schneider2016-12-181-16/+1
| * docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider2016-12-062-12/+16
* | Merge branch 'sb/t3600-cleanup' into maintJunio C Hamano2017-01-171-73/+51
|\ \
| * | t3600: slightly modernize stylesb/t3600-cleanupStefan Beller2016-12-121-73/+51
| * | t3600: remove useless redirectStefan Beller2016-12-051-1/+1
* | | Merge branch 'sb/unpack-trees-grammofix' into maintJunio C Hamano2017-01-171-1/+1
|\ \ \
| * | | unpack-trees: fix grammar for untracked files in directoriessb/unpack-trees-grammofixStefan Beller2016-12-051-1/+1
* | | | Merge branch 'ls/t0021-fixup' into maintJunio C Hamano2017-01-171-3/+2
|\ \ \ \
| * | | | t0021: minor filter process test cleanupls/t0021-fixupLars Schneider2016-12-051-3/+2
* | | | | Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2017-01-171-1/+2
|\ \ \ \ \
| * | | | | t7610: clean up foo.XXXXXX tmpdirak/lazy-prereq-mktempJeff King2016-11-291-1/+2
* | | | | | Merge branch 'dt/smart-http-detect-server-going-away' into maintJunio C Hamano2017-01-171-0/+52
|\ \ \ \ \ \
| * | | | | | upload-pack: optionally allow fetching any sha1dt/smart-http-detect-server-going-awayDavid Turner2016-11-181-0/+22
| * | | | | | remote-curl: don't hang when a server dies before any outputDavid Turner2016-11-181-0/+30
* | | | | | | Merge branch 'gv/p4-multi-path-commit-fix' into maintJunio C Hamano2017-01-171-1/+21
|\ \ \ \ \ \ \
| * | | | | | | git-p4: fix multi-path changelist empty commitsgv/p4-multi-path-commit-fixGeorge Vanburgh2016-12-191-1/+21
* | | | | | | | Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano2017-01-171-0/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: avoid crash adding symlinked directoryld/p4-compare-dir-vs-symlinkLuke Diamand2016-12-181-0/+43
* | | | | | | | | Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2017-01-171-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | push: test pushing ambiguously named branchesjc/push-default-explicitDennis Kaarsemaker2016-10-311-0/+10
* | | | | | | | | | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano2017-01-176-43/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t: use nongit() function where applicableJeff King2016-12-163-29/+5
| * | | | | | | | | | index-pack: complain when --stdin is used outside of a repoJeff King2016-12-161-0/+15
| * | | | | | | | | | t5000: extract nongit function to test-lib-functions.shJeff King2016-12-162-14/+14
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/quote-env-path-list-component' into maintJunio C Hamano2017-01-172-0/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t5615-alternate-env: double-quotes in file names do not work on WindowsJohannes Sixt2016-12-211-1/+1
| * | | | | | | | | | t5547-push-quarantine: run the path separator test on Windows, tooJohannes Sixt2016-12-131-4/+10
| * | | | | | | | | | tmp-objdir: quote paths we add to alternatesJeff King2016-12-121-0/+19
| * | | | | | | | | | alternates: accept double-quoted pathsJeff King2016-12-121-0/+18
| * | | | | | | | | | Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-componentJunio C Hamano2016-12-121-0/+71
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/sequencer-abort-safety' into maintJunio C Hamano2017-01-171-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | sequencer: make sequencer abort saferStephan Beyer2016-12-091-1/+1
| * | | | | | | | | | | | t3510: test that cherry-pick --abort does not unsafely change HEADStephan Beyer2016-12-091-0/+10
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/pull-rebase-ff' into maintJunio C Hamano2017-01-171-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pull: fast-forward "pull --rebase=true"jc/pull-rebase-ffJunio C Hamano2016-11-291-0/+17
* | | | | | | | | | | | | Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano2017-01-171-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | commit: make --only --allow-empty work without pathsAndreas Krey2016-12-051-0/+9
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'da/difftool-dir-diff-fix' into maintJunio C Hamano2017-01-171-3/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | difftool: fix dir-diff index creation when in a subdirectoryda/difftool-dir-diff-fixDavid Aguilar2016-12-081-3/+41
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jb/diff-no-index-no-abbrev' into maintJunio C Hamano2017-01-177-0/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | diff: handle --no-abbrev in no-index casejb/diff-no-index-no-abbrevJack Bates2016-12-087-0/+34
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/stash-disable-renames-internally' into maintJunio C Hamano2017-01-171-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | stash: prefer plumbing over git-diffjk/stash-disable-renames-internallyJeff King2016-12-061-0/+9
* | | | | | | | | | | | | | Merge branch 'jk/http-walker-limit-redirect' into maintJunio C Hamano2017-01-174-0/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | http: treat http-alternates like redirectsjk/http-walker-limit-redirect-2.9Jeff King2016-12-061-0/+38
| * | | | | | | | | | | | | | http: make redirects more obviousJeff King2016-12-062-0/+29
| * | | | | | | | | | | | | | http: always update the base URL for redirectsJeff King2016-12-063-0/+13
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano2017-01-171-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status