Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ez/doc-duplicated-words-fix' | Junio C Hamano | 2017-09-25 | 4 | -4/+4 |
|\ | |||||
| * | doc: fix minor typos (extra/duplicated words)ez/doc-duplicated-words-fix | Evan Zacks | 2017-09-14 | 4 | -4/+4 |
* | | Merge branch 'kd/doc-for-each-ref' | Junio C Hamano | 2017-09-25 | 1 | -16/+17 |
|\ \ | |||||
| * | | doc/for-each-ref: explicitly specify option nameskd/doc-for-each-ref | Kevin Daudt | 2017-09-12 | 1 | -9/+9 |
| * | | doc/for-each-ref: consistently use '=' to between argument names and values | Kevin Daudt | 2017-09-12 | 1 | -7/+8 |
* | | | The eighth batch for 2.15 | Junio C Hamano | 2017-09-19 | 1 | -0/+58 |
* | | | Merge branch 'ma/remove-config-maybe-bool' | Junio C Hamano | 2017-09-19 | 1 | -4/+0 |
|\ \ \ | |||||
| * | | | config: remove git_config_maybe_boolma/remove-config-maybe-bool | Martin Ågren | 2017-09-07 | 1 | -4/+0 |
* | | | | Merge branch 'bb/doc-eol-dirty' | Junio C Hamano | 2017-09-19 | 1 | -1/+4 |
|\ \ \ \ | |||||
| * | | | | Documentation: mention that `eol` can change the dirty status of pathsbb/doc-eol-dirty | Ben Boeckel | 2017-09-07 | 1 | -1/+4 |
* | | | | | Merge branch 'nd/prune-in-worktree' | Junio C Hamano | 2017-09-19 | 2 | -5/+10 |
|\ \ \ \ \ | |||||
| * | | | | | rev-list: expose and document --single-worktree | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -0/+8 |
| * | | | | | refs: remove dead for_each_*_submodule() | Nguyễn Thái Ngọc Duy | 2017-08-24 | 1 | -5/+2 |
* | | | | | | Sync with maint | Junio C Hamano | 2017-09-10 | 1 | -0/+59 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | RelNotes: further fixes for 2.14.2 from the master front | Junio C Hamano | 2017-09-10 | 1 | -0/+59 |
| * | | | | | Merge branch 'jt/doc-pack-objects-fix' into maint | Junio C Hamano | 2017-09-10 | 1 | -6/+11 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/doc-the-this' into maint | Junio C Hamano | 2017-09-10 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'mg/format-ref-doc-fix' into maint | Junio C Hamano | 2017-09-10 | 3 | -8/+9 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'ah/doc-empty-string-is-false' into maint | Junio C Hamano | 2017-09-10 | 2 | -6/+7 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'mg/killed-merge' into maint | Junio C Hamano | 2017-09-10 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ma/pager-per-subcommand-action' into maint | Junio C Hamano | 2017-09-10 | 2 | -73/+3 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | The seventh batch post 2.14 | Junio C Hamano | 2017-09-10 | 1 | -40/+17 |
* | | | | | | | | | | Merge branch 'ma/up-to-date' | Junio C Hamano | 2017-09-10 | 17 | -28/+30 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | treewide: correct several "up-to-date" to "up to date"ma/up-to-date | Martin Ågren | 2017-08-23 | 17 | -24/+24 |
| * | | | | | | | | | | Documentation/user-manual: update outdated example output | Martin Ågren | 2017-08-23 | 1 | -4/+6 |
* | | | | | | | | | | | The sixth batch post 2.14 | Junio C Hamano | 2017-09-06 | 1 | -0/+10 |
* | | | | | | | | | | | Merge branch 'ks/branch-set-upstream' | Junio C Hamano | 2017-09-06 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | builtin/branch: stop supporting the "--set-upstream" option | Kaartic Sivaraam | 2017-08-17 | 1 | -4/+2 |
* | | | | | | | | | | | | The fifth batch post 2.14 | Junio C Hamano | 2017-08-26 | 1 | -1/+49 |
* | | | | | | | | | | | | Merge branch 'mg/killed-merge' | Junio C Hamano | 2017-08-26 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Documentation/git-merge: explain --continue | Michael J Gruber | 2017-08-21 | 1 | -1/+4 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'mh/ref-lock-entry' | Junio C Hamano | 2017-08-26 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | refs: retry acquiring reference locks for 100msmh/ref-lock-entry | Michael Haggerty | 2017-08-23 | 1 | -0/+6 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jt/doc-pack-objects-fix' | Junio C Hamano | 2017-08-26 | 1 | -6/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Doc: clarify that pack-objects makes packs, pluraljt/doc-pack-objects-fix | Jonathan Tan | 2017-08-23 | 1 | -6/+11 |
* | | | | | | | | | | | Merge branch 'jc/cutoff-config' | Junio C Hamano | 2017-08-26 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-config | Junio C Hamano | 2017-08-22 | 1 | -0/+2 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/trailers-parse' | Junio C Hamano | 2017-08-26 | 2 | -8/+30 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | doc/interpret-trailers: fix "the this" typojk/trailers-parse | Martin Ågren | 2017-08-20 | 1 | -1/+1 |
| * | | | | | | | | | | | pretty: support normalization options for %(trailers) | Jeff King | 2017-08-15 | 1 | -1/+4 |
| * | | | | | | | | | | | interpret-trailers: add --parse convenience option | Jeff King | 2017-08-15 | 1 | -7/+14 |
| * | | | | | | | | | | | interpret-trailers: add an option to unfold values | Jeff King | 2017-08-15 | 1 | -0/+4 |
| * | | | | | | | | | | | interpret-trailers: add an option to show only existing trailers | Jeff King | 2017-08-15 | 1 | -0/+5 |
| * | | | | | | | | | | | interpret-trailers: add an option to show only the trailers | Jeff King | 2017-08-15 | 1 | -0/+3 |
* | | | | | | | | | | | | Merge branch 'pb/trailers-from-command-line' | Junio C Hamano | 2017-08-26 | 1 | -2/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | interpret-trailers: fix documentation typopb/trailers-from-command-line | Paolo Bonzini | 2017-08-14 | 1 | -2/+2 |
| * | | | | | | | | | | | | interpret-trailers: add options for actions | Paolo Bonzini | 2017-08-14 | 1 | -0/+23 |
* | | | | | | | | | | | | | Merge branch 'jt/diff-color-move-fix' | Junio C Hamano | 2017-08-26 | 1 | -5/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | diff: define block by number of alphanumeric charsjt/diff-color-move-fix | Jonathan Tan | 2017-08-16 | 1 | -5/+3 |
* | | | | | | | | | | | | | | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-08-26 | 2 | -2/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |