Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' into maint | Junio C Hamano | 2017-11-15 |
|\ | |||
| * | diff: fix lstat() error handling in diff_populate_filespec() | Andrey Okoshkin | 2017-10-29 |
* | | Merge branch 'sb/blame-config-doc' into maint | Junio C Hamano | 2017-11-15 |
|\ \ | |||
| * | | config: document blame configuration | Stefan Beller | 2017-11-06 |
* | | | Merge branch 'tb/complete-checkout' into maint | Junio C Hamano | 2017-11-15 |
|\ \ \ | |||
| * | | | completion: add remaining flags to checkout | Thomas Braun | 2017-10-25 |
* | | | | Merge branch 'jc/check-ref-format-oor' into maint | Junio C Hamano | 2017-11-15 |
|\ \ \ \ | |||
| * | | | | check-ref-format doc: --branch validates and expands <branch> | Junio C Hamano | 2017-10-18 |
| * | | | | check-ref-format --branch: strip refs/heads/ using skip_prefix | Junio C Hamano | 2017-10-18 |
| * | | | | check-ref-format --branch: do not expand @{...} outside repository | Junio C Hamano | 2017-10-18 |
* | | | | | Merge branch 'jc/t5601-copy-workaround' into maint | Junio C Hamano | 2017-11-15 |
|\ \ \ \ \ | |||
| * | | | | | t5601: rm the target file of cp that could still be executing | Junio C Hamano | 2017-10-17 |
* | | | | | | Merge branch 'jk/rebase-i-exec-gitdir-fix' into maint | Junio C Hamano | 2017-11-15 |
|\ \ \ \ \ \ | |||
| * | | | | | | sequencer: pass absolute GIT_DIR to exec commands | Jacob Keller | 2017-11-02 |
* | | | | | | | Merge branch 'bw/grep-recurse-submodules' into maint | Junio C Hamano | 2017-11-15 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | grep: take the read-lock when adding a submodule | Martin Ågren | 2017-11-02 |
* | | | | | | | | Merge branch 'js/submodule-in-excluded' into maint | Junio C Hamano | 2017-11-15 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | status: do not get confused by submodules in excluded directories | Johannes Schindelin | 2017-10-26 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||
* | | | | | | | | Merge branch 'ao/check-resolve-ref-unsafe-result' into maint | Junio C Hamano | 2017-11-15 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | commit: check result of resolve_ref_unsafe | Andrey Okoshkin | 2017-10-21 |
* | | | | | | | | | Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maint | Junio C Hamano | 2017-11-15 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | worktree: handle broken symrefs in find_shared_symref() | Jeff King | 2017-10-21 |
| * | | | | | | | | | log: handle broken HEAD in decoration check | Jeff King | 2017-10-21 |
| * | | | | | | | | | remote: handle broken symrefs | Jeff King | 2017-10-21 |
| * | | | | | | | | | test-ref-store: avoid passing NULL to printf | Jeff King | 2017-10-21 |
* | | | | | | | | | | Merge branch 'sb/diff-color-moved-use-xdl-recmatch' into maint | Junio C Hamano | 2017-11-15 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | diff.c: get rid of duplicate implementation | Stefan Beller | 2017-10-26 |
| * | | | | | | | | | | xdiff-interface: export comparing and hashing strings | Stefan Beller | 2017-10-26 |
* | | | | | | | | | | | Merge branch 'jk/diff-color-moved-fix' into maint | Junio C Hamano | 2017-11-15 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||
| * | | | | | | | | | | diff: handle NULs in get_string_hash() | Jeff King | 2017-10-21 |
| * | | | | | | | | | | diff: fix whitespace-skipping with --color-moved | Jeff King | 2017-10-21 |
| * | | | | | | | | | | t4015: test the output of "diff --color-moved -b" | Jeff King | 2017-10-21 |
| * | | | | | | | | | | t4015: check "negative" case for "-w --color-moved" | Jeff King | 2017-10-21 |
| * | | | | | | | | | | t4015: refactor --color-moved whitespace test | Jeff King | 2017-10-21 |
| |/ / / / / / / / / | |||
* | | | | | | | | | | Merge branch 'kd/auto-col-with-pager-fix' into maint | Junio C Hamano | 2017-11-15 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | column: do not include pager.c | Junio C Hamano | 2017-10-24 |
| * | | | | | | | | | | column: show auto columns when pager is active | Kevin Daudt | 2017-10-17 |
* | | | | | | | | | | | Merge branch 'sg/travis-fixes' into maint | Junio C Hamano | 2017-11-15 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | travis-ci: don't build Git for the static analysis job | SZEDER Gábor | 2017-11-02 |
| * | | | | | | | | | | | travis-ci: fix running P4 and Git LFS tests in Linux build jobs | SZEDER Gábor | 2017-11-02 |
* | | | | | | | | | | | | Git 2.15 | Junio C Hamano | 2017-10-30 |
* | | | | | | | | | | | | Merge tag 'l10n-2.15.0-rnd2.1' of git://github.com/git-l10n/git-po | Junio C Hamano | 2017-10-30 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | l10n: Update Catalan translation | Jordi Mas | 2017-10-29 |
* | | | | | | | | | | | | | Hopefully final batch before 2.15 | Junio C Hamano | 2017-10-28 |
* | | | | | | | | | | | | | Merge branch 'sg/rev-list-doc-reorder-fix' | Junio C Hamano | 2017-10-28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | rev-list-options.txt: use correct directional reference | SZEDER Gábor | 2017-10-27 |
* | | | | | | | | | | | | | | Merge branch 'sb/rev-parse-show-superproject-root' | Junio C Hamano | 2017-10-28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | docs: fix formatting of rev-parse's --show-superproject-working-tree | Sebastian Schuberth | 2017-10-27 |
* | | | | | | | | | | | | | | | Merge branch 'ao/path-use-xmalloc' | Junio C Hamano | 2017-10-28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | path.c: use xmalloc() in add_to_trie() | Andrey Okoshkin | 2017-10-25 |
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |