Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | name-rev: favor describing with tags and use committer date to tiebreakjc/name-rev-lw-tag | Junio C Hamano | 2017-03-29 | 1 | -9/+44 |
* | name-rev: refactor logic to see if a new candidate is a better name | Junio C Hamano | 2017-03-29 | 1 | -3/+13 |
* | describe: localize debug output fully | Michael J Gruber | 2017-03-27 | 1 | -3/+12 |
* | Merge branch 'sb/describe-broken' | Junio C Hamano | 2017-03-27 | 1 | -9/+38 |
|\ | |||||
| * | builtin/describe: introduce --broken flagsb/describe-broken | Stefan Beller | 2017-03-22 | 1 | -9/+38 |
* | | Merge branch 'sb/push-options-via-transport' | Junio C Hamano | 2017-03-27 | 1 | -0/+5 |
|\ \ | |||||
| * | | remote-curl: allow push optionssb/push-options-via-transport | Brandon Williams | 2017-03-22 | 1 | -0/+5 |
* | | | Merge branch 'jk/prefix-filename' | Junio C Hamano | 2017-03-27 | 8 | -38/+27 |
|\ \ \ | |||||
| * | | | bundle: use prefix_filename with bundle pathjk/prefix-filename | Jeff King | 2017-03-21 | 1 | -7/+1 |
| * | | | prefix_filename: return newly allocated string | Jeff King | 2017-03-21 | 7 | -18/+21 |
| * | | | prefix_filename: drop length parameter | Jeff King | 2017-03-21 | 7 | -20/+9 |
| * | | | hash-object: fix buffer reuse with --path in a subdirectory | Jeff King | 2017-03-21 | 1 | -2/+5 |
| | |/ | |/| | |||||
* | | | Merge branch 'rs/update-hook-optim' | Junio C Hamano | 2017-03-24 | 1 | -8/+5 |
|\ \ \ | |||||
| * | | | receive-pack: simplify run_update_post_hook()rs/update-hook-optim | René Scharfe | 2017-03-18 | 1 | -8/+5 |
* | | | | Merge branch 'rs/shortlog-cleanup' | Junio C Hamano | 2017-03-24 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | shortlog: don't set after_subject to an empty stringrs/shortlog-cleanup | René Scharfe | 2017-03-18 | 1 | -1/+0 |
* | | | | | Merge branch 'jk/pack-name-cleanups' | Junio C Hamano | 2017-03-21 | 1 | -16/+15 |
|\ \ \ \ \ | |||||
| * | | | | | index-pack: make pointer-alias fallbacks saferjk/pack-name-cleanups | Jeff King | 2017-03-16 | 1 | -8/+12 |
| * | | | | | replace snprintf with odb_pack_name() | Jeff King | 2017-03-16 | 1 | -16/+11 |
| * | | | | | odb_pack_keep(): stop generating keepfile name | Jeff King | 2017-03-16 | 1 | -3/+3 |
* | | | | | | Merge branch 'jk/rev-parse-cleanup' | Junio C Hamano | 2017-03-21 | 1 | -52/+57 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | rev-parse: simplify parsing of ref optionsjk/rev-parse-cleanup | Jeff King | 2017-03-15 | 1 | -29/+16 |
| * | | | | | rev-parse: add helper for parsing "--foo/--foo=" | Jeff King | 2017-03-15 | 1 | -10/+28 |
| * | | | | | rev-parse: use skip_prefix when parsing options | Jeff King | 2017-03-15 | 1 | -20/+20 |
| |/ / / / | |||||
* | | | | | 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 |