Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/diff-tree-stale-comment' | Junio C Hamano | 2017-06-13 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | diff-tree: update stale in-code commentsjc/diff-tree-stale-comment | Junio C Hamano | 2017-06-02 | 1 | -3/+5 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-blanket-recursive' | Junio C Hamano | 2017-06-13 | 16 | -98/+179 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | builtin/fetch.c: respect 'submodule.recurse' optionsb/submodule-blanket-recursive | Stefan Beller | 2017-06-01 | 2 | -0/+17 | |
| * | | | | | | | | | | | | | | | | | | | builtin/push.c: respect 'submodule.recurse' option | Stefan Beller | 2017-06-01 | 2 | -0/+25 | |
| * | | | | | | | | | | | | | | | | | | | builtin/grep.c: respect 'submodule.recurse' option | Stefan Beller | 2017-06-01 | 2 | -0/+21 | |
| * | | | | | | | | | | | | | | | | | | | Introduce 'submodule.recurse' option for worktree manipulators | Stefan Beller | 2017-06-01 | 7 | -5/+58 | |
| * | | | | | | | | | | | | | | | | | | | submodule loading: separate code path for .gitmodules and config overlay | Stefan Beller | 2017-05-30 | 1 | -3/+11 | |
| * | | | | | | | | | | | | | | | | | | | reset/checkout/read-tree: unify config callback for submodule recursion | Stefan Beller | 2017-05-30 | 5 | -83/+38 | |
| * | | | | | | | | | | | | | | | | | | | submodule test invocation: only pass additional arguments | Stefan Beller | 2017-05-30 | 4 | -10/+12 | |
| * | | | | | | | | | | | | | | | | | | | submodule recursing: do not write a config variable twice | Stefan Beller | 2017-05-30 | 3 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursive | Junio C Hamano | 2017-05-30 | 24 | -239/+843 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/noent-notdir' | Junio C Hamano | 2017-06-13 | 9 | -10/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checkedjc/noent-notdir | Junio C Hamano | 2017-05-30 | 8 | -10/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | compat-util: is_missing_file_error() | Junio C Hamano | 2017-05-30 | 1 | -0/+15 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://bogomips.org/git-svn | Junio C Hamano | 2017-06-10 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | doc: describe git svn init --ignore-refs | Andreas Heiduk | 2017-06-07 | 1 | -0/+16 | |
|/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2017-06-07 | 3 | -9/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/sha1dc-maint' into maint | Junio C Hamano | 2017-06-07 | 3 | -9/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | sha1dc: update from upstream | Ævar Arnfjörð Bjarmason | 2017-06-07 | 2 | -9/+27 | |
| | * | | | | | | | | | | | | | | | | | | | | | sha1dc: ignore indent-with-non-tab whitespace violations | Jeff King | 2017-06-07 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | Sync with v2.13.1 | Junio C Hamano | 2017-06-05 | 2 | -510/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Git 2.13.1v2.13.1 | Junio C Hamano | 2017-06-05 | 3 | -511/+46 | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/doc-rev-parse-short-default' into maint | Junio C Hamano | 2017-06-05 | 2 | -6/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/doc-filter-branch-export-env' into maint | Junio C Hamano | 2017-06-05 | 1 | -4/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sd/t3200-typofix' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/t5531-update-desc' into maint | Junio C Hamano | 2017-06-05 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/doc-pretty-format-fix' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/doc-interpret-trailers-ifexists' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/ref-filter-no-contains' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/core-filemode-doc-typofix' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/dedup-crlf-tests' into maint | Junio C Hamano | 2017-06-05 | 2 | -187/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/credential-doc-on-clear' into maint | Junio C Hamano | 2017-06-05 | 1 | -10/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/url-insteadof-config' into maint | Junio C Hamano | 2017-06-05 | 2 | -0/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/unbreak-am-h' into maint | Junio C Hamano | 2017-06-05 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/sha1dc-maint' into maint | Junio C Hamano | 2017-06-05 | 7 | -88/+172 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/bs-is-a-dir-sep-on-windows' into maint | Junio C Hamano | 2017-06-05 | 2 | -2/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/alternate-ref-optim' into maint | Junio C Hamano | 2017-06-05 | 1 | -1/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maint | Junio C Hamano | 2017-06-05 | 5 | -13/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kn/ref-filter-branch-list' into maint | Junio C Hamano | 2017-06-05 | 1 | -7/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/checkout-am-fix-unborn' into maint | Junio C Hamano | 2017-06-05 | 2 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/clone-add-empty-config-from-command-line' into maint | Junio C Hamano | 2017-06-05 | 2 | -1/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/c-translators-comment-style' into maint | Junio C Hamano | 2017-06-05 | 9 | -26/+46 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/travis-doc-asciidoctor' into maint | Junio C Hamano | 2017-06-05 | 2 | -4/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seventh batch for 2.14 | Junio C Hamano | 2017-06-05 | 1 | -43/+28 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ad/pull-remote-doc' | Junio C Hamano | 2017-06-05 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: fix formatting and grammarad/pull-remote-doc | Adam Dinwoodie | 2017-06-02 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/pull-ff-rebase-autostash' | Junio C Hamano | 2017-06-05 | 2 | -11/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull: ff --rebase --autostash works in dirty repotb/pull-ff-rebase-autostash | Tyler Brazier | 2017-06-01 | 2 | -11/+32 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/drop-free-refspecs' | Junio C Hamano | 2017-06-05 | 1 | -22/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |