Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | The first batch for 2.16 | Junio C Hamano | 2017-11-06 | 2 | -1/+85 |
* | Merge branch 'ex/deprecate-empty-pathspec-as-match-all' | Junio C Hamano | 2017-11-06 | 4 | -14/+9 |
|\ | |||||
| * | pathspec: die on empty strings as pathspecex/deprecate-empty-pathspec-as-match-all | Emily Xie | 2017-06-23 | 3 | -13/+8 |
| * | t0027: do not use an empty string as a pathspec element | Junio C Hamano | 2017-06-23 | 1 | -1/+1 |
* | | Merge branch 'jk/rebase-i-exec-gitdir-fix' | Junio C Hamano | 2017-11-06 | 2 | -1/+17 |
|\ \ | |||||
| * | | sequencer: pass absolute GIT_DIR to exec commandsjk/rebase-i-exec-gitdir-fix | Jacob Keller | 2017-11-02 | 2 | -1/+17 |
* | | | Merge branch 'cn/diff-indent-no-longer-is-experimental' | Junio C Hamano | 2017-11-06 | 4 | -9/+6 |
|\ \ \ | |||||
| * | | | diff: --indent-heuristic is no longer experimentalcn/diff-indent-no-longer-is-experimental | Carlos Martín Nieto | 2017-11-02 | 4 | -9/+6 |
* | | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-11-06 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | grep: take the read-lock when adding a submodulebw/grep-recurse-submodules | Martin Ågren | 2017-11-02 | 1 | -0/+2 |
* | | | | | Merge branch 'mh/test-local-canary' | Junio C Hamano | 2017-11-06 | 1 | -0/+25 |
|\ \ \ \ \ | |||||
| * | | | | | t0000: check whether the shell supports the "local" keywordmh/test-local-canary | Michael Haggerty | 2017-10-31 | 1 | -0/+25 |
* | | | | | | Merge branch 'js/submodule-in-excluded' | Junio C Hamano | 2017-11-06 | 2 | -1/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | status: do not get confused by submodules in excluded directoriesjs/submodule-in-excluded | Johannes Schindelin | 2017-10-26 | 2 | -1/+12 |
* | | | | | | | Merge branch 'ao/check-resolve-ref-unsafe-result' | Junio C Hamano | 2017-11-06 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit: check result of resolve_ref_unsafeao/check-resolve-ref-unsafe-result | Andrey Okoshkin | 2017-10-21 | 1 | -0/+2 |
* | | | | | | | | Merge branch 'jk/misc-resolve-ref-unsafe-fixes' | Junio C Hamano | 2017-11-06 | 4 | -4/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | worktree: handle broken symrefs in find_shared_symref()jk/misc-resolve-ref-unsafe-fixes | Jeff King | 2017-10-21 | 1 | -1/+2 |
| * | | | | | | | | log: handle broken HEAD in decoration check | Jeff King | 2017-10-21 | 1 | -1/+1 |
| * | | | | | | | | remote: handle broken symrefs | Jeff King | 2017-10-21 | 1 | -1/+1 |
| * | | | | | | | | test-ref-store: avoid passing NULL to printf | Jeff King | 2017-10-21 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'sb/diff-color-moved-use-xdl-recmatch' | Junio C Hamano | 2017-11-06 | 3 | -78/+32 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | diff.c: get rid of duplicate implementationsb/diff-color-moved-use-xdl-recmatch | Stefan Beller | 2017-10-26 | 1 | -78/+4 |
| * | | | | | | | | | xdiff-interface: export comparing and hashing strings | Stefan Beller | 2017-10-26 | 2 | -0/+28 |
* | | | | | | | | | | Merge branch 'jk/diff-color-moved-fix' | Junio C Hamano | 2017-11-06 | 2 | -42/+188 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | diff: handle NULs in get_string_hash()jk/diff-color-moved-fix | Jeff King | 2017-10-21 | 1 | -1/+1 |
| * | | | | | | | | | diff: fix whitespace-skipping with --color-moved | Jeff King | 2017-10-21 | 2 | -5/+77 |
| * | | | | | | | | | t4015: test the output of "diff --color-moved -b" | Jeff King | 2017-10-21 | 1 | -9/+64 |
| * | | | | | | | | | t4015: check "negative" case for "-w --color-moved" | Jeff King | 2017-10-21 | 1 | -8/+18 |
| * | | | | | | | | | t4015: refactor --color-moved whitespace test | Jeff King | 2017-10-21 | 1 | -20/+29 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'kd/auto-col-with-pager-fix' | Junio C Hamano | 2017-11-06 | 2 | -1/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | column: do not include pager.ckd/auto-col-with-pager-fix | Junio C Hamano | 2017-10-24 | 1 | -1/+0 |
| * | | | | | | | | | column: show auto columns when pager is active | Kevin Daudt | 2017-10-17 | 2 | -1/+16 |
* | | | | | | | | | | Merge branch 'jc/no-cmd-as-subroutine' | Junio C Hamano | 2017-11-06 | 2 | -13/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | merge-ours: do not use cmd_*() as a subroutinejc/no-cmd-as-subroutine | Junio C Hamano | 2017-10-11 | 1 | -9/+7 |
| * | | | | | | | | | | describe: do not use cmd_*() as a subroutine | Junio C Hamano | 2017-10-11 | 1 | -4/+11 |
* | | | | | | | | | | | Merge branch 'ma/lockfile-fixes' | Junio C Hamano | 2017-11-06 | 21 | -131/+123 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | read_cache: roll back lock in `update_index_if_able()`ma/lockfile-fixes | Martin Ågren | 2017-10-07 | 2 | -3/+6 |
| * | | | | | | | | | | read-cache: leave lock in right state in `write_locked_index()` | Martin Ågren | 2017-10-07 | 5 | -11/+13 |
| * | | | | | | | | | | read-cache: drop explicit `CLOSE_LOCK`-flag | Martin Ågren | 2017-10-07 | 3 | -14/+15 |
| * | | | | | | | | | | cache.h: document `write_locked_index()` | Martin Ågren | 2017-10-06 | 1 | -0/+16 |
| * | | | | | | | | | | apply: remove `newfd` from `struct apply_state` | Martin Ågren | 2017-10-06 | 2 | -13/+7 |
| * | | | | | | | | | | apply: move lockfile into `apply_state` | Martin Ågren | 2017-10-06 | 4 | -17/+9 |
| * | | | | | | | | | | cache-tree: simplify locking logic | Martin Ågren | 2017-10-06 | 1 | -8/+4 |
| * | | | | | | | | | | checkout-index: simplify locking logic | Martin Ågren | 2017-10-06 | 1 | -5/+3 |
| * | | | | | | | | | | tempfile: fix documentation on `delete_tempfile()` | Martin Ågren | 2017-10-06 | 1 | -4/+4 |
| * | | | | | | | | | | lockfile: fix documentation on `close_lock_file_gently()` | Martin Ågren | 2017-10-06 | 1 | -2/+2 |
| * | | | | | | | | | | treewide: prefer lockfiles on the stack | Martin Ågren | 2017-10-06 | 8 | -49/+42 |
| * | | | | | | | | | | sha1_file: do not leak `lock_file` | Martin Ågren | 2017-10-06 | 1 | -11/+8 |
* | | | | | | | | | | | Git 2.15v2.15.0 | Junio C Hamano | 2017-10-30 | 1 | -1/+1 |