Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | builtin/log: honor log.decorateah/log-decorate-default-to-auto | brian m. carlson | 2017-05-15 | 1 | -2/+2 |
* | log: if --decorate is not given, default to --decorate=auto | Alex Henrie | 2017-03-24 | 1 | -1/+8 |
* | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-03-20 | 1 | -5/+46 |
|\ | |||||
| * | difftool: handle modified symlinks in dir-diff mode | David Aguilar | 2017-03-15 | 1 | -5/+46 |
* | | Merge branch 'jk/cherry-pick-0-mainline' | Junio C Hamano | 2017-03-17 | 1 | -1/+20 |
|\ \ | |||||
| * | | cherry-pick: detect bogus arguments to --mainlinejk/cherry-pick-0-mainline | Jeff King | 2017-03-15 | 1 | -1/+20 |
* | | | Merge branch 'sb/rev-parse-show-superproject-root' | Junio C Hamano | 2017-03-17 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | rev-parse: add --show-superproject-working-tree | Stefan Beller | 2017-03-08 | 1 | -0/+7 |
* | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-03-17 | 20 | -360/+357 |
|\ \ \ \ | |||||
| * | | | | builtin/merge-base: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -14/+14 |
| * | | | | Convert object iteration callbacks to struct object_id | brian m. carlson | 2017-02-22 | 6 | -27/+27 |
| * | | | | refs: convert each_reflog_ent_fn to struct object_id | brian m. carlson | 2017-02-22 | 3 | -12/+12 |
| * | | | | builtin/replace: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -56/+56 |
| * | | | | Convert remaining callers of resolve_refdup to object_id | brian m. carlson | 2017-02-22 | 2 | -11/+11 |
| * | | | | builtin/merge: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -68/+66 |
| * | | | | builtin/clone: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -5/+5 |
| * | | | | builtin/branch: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -13/+13 |
| * | | | | builtin/grep: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -12/+12 |
| * | | | | builtin/fmt-merge-message: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -35/+35 |
| * | | | | builtin/fast-export: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -29/+29 |
| * | | | | builtin/describe: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -25/+25 |
| * | | | | builtin/diff-tree: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -32/+31 |
| * | | | | builtin/commit: convert to struct object_id | brian m. carlson | 2017-02-20 | 1 | -23/+23 |
* | | | | | Merge branch 'rs/blame-code-cleanup' | Junio C Hamano | 2017-03-17 | 1 | -17/+8 |
|\ \ \ \ \ | |||||
| * | | | | | blame: move blame_entry duplication to add_blame_entry()rs/blame-code-cleanup | René Scharfe | 2017-03-11 | 1 | -17/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'cc/split-index-config' | Junio C Hamano | 2017-03-17 | 2 | -25/+17 |
|\ \ \ \ \ | |||||
| * | | | | | config: add git_config_get_expiry() from gc.c | Christian Couder | 2017-03-01 | 1 | -13/+2 |
| * | | | | | update-index: warn in case of split-index incoherency | Christian Couder | 2017-03-01 | 1 | -1/+10 |
| * | | | | | split-index: add {add,remove}_split_index() functions | Christian Couder | 2017-03-01 | 1 | -12/+6 |
* | | | | | | Merge branch 'kn/ref-filter-branch-list' | Junio C Hamano | 2017-03-14 | 1 | -4/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | branch: honor --abbrev/--no-abbrev in --list mode | Junio C Hamano | 2017-03-10 | 1 | -4/+15 |
* | | | | | | | Merge branch 'jk/push-deadlock-regression-fix' | Junio C Hamano | 2017-03-14 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | receive-pack: fix deadlock when we cannot create tmpdir | Jeff King | 2017-03-07 | 1 | -1/+4 |
* | | | | | | | | Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' | Junio C Hamano | 2017-03-14 | 1 | -6/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch-pack: move code to report unmatched refs to a function | Matt McCutchen | 2017-03-02 | 1 | -6/+1 |
* | | | | | | | | | Merge branch 'jk/interpret-branch-name' | Junio C Hamano | 2017-03-14 | 3 | -3/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | checkout: restrict @-expansions when finding branchjk/interpret-branch-name | Jeff King | 2017-03-02 | 1 | -1/+1 |
| * | | | | | | | | | branch: restrict @-expansions when deleting | Jeff King | 2017-03-02 | 1 | -1/+4 |
| * | | | | | | | | | interpret_branch_name: allow callers to restrict expansions | Jeff King | 2017-03-02 | 3 | -3/+3 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'js/realpath-pathdup-fix' | Junio C Hamano | 2017-03-12 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | real_pathdup(): fix callsites that wanted it to die on errorjs/realpath-pathdup-fix | Johannes Schindelin | 2017-03-08 | 1 | -3/+3 |
* | | | | | | | | | | Merge branch 'rs/log-email-subject' | Junio C Hamano | 2017-03-10 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | pretty: use fmt_output_email_subject()rs/log-email-subject | René Scharfe | 2017-03-01 | 2 | -3/+4 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'sb/submodule-init-url-selection' | Junio C Hamano | 2017-03-10 | 1 | -5/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | submodule init: warn about falling back to a local pathsb/submodule-init-url-selection | Stefan Beller | 2017-02-28 | 1 | -5/+3 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rl/remote-allow-missing-branch-name-merge' | Junio C Hamano | 2017-02-27 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | remote: ignore failure to remove missing branch.<name>.mergerl/remote-allow-missing-branch-name-merge | Ross Lagerwall | 2017-02-21 | 1 | -1/+3 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'km/delete-ref-reflog-message' | Junio C Hamano | 2017-02-27 | 9 | -14/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | branch: record creation of renamed branch in HEAD's logkm/delete-ref-reflog-message | Kyle Meyer | 2017-02-20 | 1 | -2/+3 |
| * | | | | | | | | | update-ref: pass reflog message to delete_ref() | Kyle Meyer | 2017-02-20 | 1 | -1/+1 |