Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-svn: hoist out utf8 prep from t9129 to lib-git-svn | Eric Wong | 2016-02-22 | 2 | -11/+13 |
* | Merge branch 'da/user-useconfigonly' | Junio C Hamano | 2016-02-17 | 1 | -0/+39 |
|\ | |||||
| * | ident: add user.useConfigOnly boolean for when ident shouldn't be guessed | Dan Aloni | 2016-02-08 | 1 | -0/+39 |
* | | Merge branch 'nd/clear-gitenv-upon-use-of-alias' | Junio C Hamano | 2016-02-17 | 1 | -0/+52 |
|\ \ | |||||
| * | | git: remove an early return from save_env_before_alias() | Junio C Hamano | 2016-01-28 | 1 | -0/+52 |
* | | | Merge branch 'mg/mingw-test-fix' | Junio C Hamano | 2016-02-17 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | t9100: fix breakage when SHELL_PATH is not /bin/sh | Michael J Gruber | 2016-02-08 | 1 | -1/+2 |
* | | | | Merge branch 'js/mingw-tests' | Junio C Hamano | 2016-02-17 | 23 | -54/+84 |
|\| | | | |||||
| * | | | mingw: do not bother to test funny file names | Johannes Schindelin | 2016-01-28 | 8 | -5/+9 |
| * | | | mingw: skip a test in t9130 that cannot pass on Windows | Johannes Schindelin | 2016-01-28 | 1 | -1/+1 |
| * | | | mingw: handle the missing POSIXPERM prereq in t9124 | Johannes Schindelin | 2016-01-28 | 1 | -6/+10 |
| * | | | mingw: avoid illegal filename in t9118 | Johannes Schindelin | 2016-01-28 | 1 | -3/+9 |
| * | | | mingw: mark t9100's test cases with appropriate prereqs | Johannes Schindelin | 2016-01-28 | 1 | -9/+9 |
| * | | | t0008: avoid absolute path | Pat Thoyts | 2016-01-28 | 1 | -1/+1 |
| * | | | mingw: work around pwd issues in the tests | Johannes Schindelin | 2016-01-28 | 4 | -16/+16 |
| * | | | mingw: fix t9700's assumption about directory separators | Johannes Schindelin | 2016-01-28 | 1 | -1/+1 |
| * | | | mingw: skip test in t1508 that fails due to path conversion | Johannes Schindelin | 2016-01-28 | 1 | -1/+5 |
| * | | | tests: turn off git-daemon tests if FIFOs are not available | Johannes Schindelin | 2016-01-28 | 1 | -0/+5 |
| * | | | mingw: disable mkfifo-based tests | Johannes Schindelin | 2016-01-27 | 1 | -1/+1 |
| * | | | mingw: accomodate t0060-path-utils for MSYS2 | Johannes Schindelin | 2016-01-27 | 1 | -0/+9 |
| * | | | mingw: fix t5601-clone.sh | Johannes Schindelin | 2016-01-27 | 1 | -10/+8 |
| | |/ | |/| | |||||
* | | | Merge branch 'jk/drop-rsync-transport' | Junio C Hamano | 2016-02-17 | 1 | -36/+0 |
|\ \ \ | |||||
| * | | | transport: drop support for git-over-rsync | Jeff King | 2016-02-01 | 1 | -36/+0 |
| |/ / | |||||
* | | | Merge branch 'js/test-lib-windows-emulated-yes' | Junio C Hamano | 2016-02-10 | 1 | -2/+4 |
|\ \ \ | |||||
| * | | | test-lib: limit the output of the yes utility | Johannes Schindelin | 2016-02-02 | 1 | -2/+4 |
| |/ / | |||||
* | | | Merge branch 'wp/sha1-name-negative-match' | Junio C Hamano | 2016-02-10 | 1 | -1/+52 |
|\ \ \ | |||||
| * | | | object name: introduce '^{/!-<negative pattern>}' notation | Will Palmer | 2016-02-01 | 1 | -1/+30 |
| * | | | test for '!' handling in rev-parse's named commits | Will Palmer | 2016-01-11 | 1 | -1/+23 |
* | | | | Merge branch 'aw/push-force-with-lease-reporting' | Junio C Hamano | 2016-02-10 | 1 | -5/+10 |
|\ \ \ \ | |||||
| * | | | | push: fix ref status reporting for --force-with-lease | Andrew Wheeler | 2016-02-02 | 1 | -5/+10 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'ls/clean-smudge-override-in-config' | Junio C Hamano | 2016-02-10 | 1 | -0/+16 |
|\ \ \ \ | |||||
| * | | | | convert: treat an empty string for clean/smudge filters as "cat" | Lars Schneider | 2016-01-29 | 1 | -0/+16 |
| |/ / / | |||||
* | | | | Merge branch 'cc/untracked' | Junio C Hamano | 2016-02-10 | 1 | -7/+82 |
|\ \ \ \ | |||||
| * | | | | t7063: add tests for core.untrackedCache | Christian Couder | 2016-01-27 | 1 | -4/+81 |
| * | | | | config: add core.untrackedCache | Christian Couder | 2016-01-27 | 1 | -3/+1 |
* | | | | | Merge branch 'js/xmerge-marker-eol' | Junio C Hamano | 2016-02-10 | 1 | -0/+13 |
|\ \ \ \ \ | |||||
| * | | | | | merge-file: ensure that conflict sections match eol style | Johannes Schindelin | 2016-01-27 | 1 | -1/+2 |
| * | | | | | merge-file: let conflict markers match end-of-line style of the context | Johannes Schindelin | 2016-01-27 | 1 | -0/+12 |
* | | | | | | Merge branch 'jk/ref-cache-non-repository-optim' | Junio C Hamano | 2016-02-03 | 2 | -0/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | resolve_gitlink_ref: ignore non-repository paths | Jeff King | 2016-01-25 | 2 | -0/+11 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'js/dirname-basename' | Junio C Hamano | 2016-02-03 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t0060: verify that basename() and dirname() work as expected | Johannes Schindelin | 2016-01-12 | 1 | -0/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'nd/diff-with-path-params' | Junio C Hamano | 2016-02-03 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: make -O and --output work in subdirectory | Duy Nguyen | 2016-01-21 | 1 | -0/+6 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'jk/pending-keep-tag-name' into maint | Junio C Hamano | 2016-01-04 | 1 | -0/+29 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/symbolic-ref-maint' into maint | Junio C Hamano | 2016-01-04 | 1 | -0/+22 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'tg/ls-remote-symref' | Junio C Hamano | 2016-02-03 | 1 | -0/+45 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ls-remote: add support for showing symrefs | Thomas Gummerer | 2016-01-19 | 1 | -0/+45 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'tb/ls-files-eol' | Junio C Hamano | 2016-02-03 | 1 | -21/+100 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ls-files: add eol diagnostics | Torsten Bögershausen | 2016-01-19 | 1 | -21/+100 |