Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'es/blame-commit-info-fix' into maint | Junio C Hamano | 2015-03-05 | 1 | -3/+2 |
|\ | |||||
| * | builtin/blame: destroy initialized commit_info only | Eric Sunshine | 2015-02-10 | 1 | -3/+2 |
* | | Merge branch 'ab/merge-file-prefix' into maint | Junio C Hamano | 2015-03-05 | 1 | -1/+2 |
|\ \ | |||||
| * | | merge-file: correctly open files when in a subdir | Aleksander Boruch-Gruszecki | 2015-02-11 | 1 | -1/+2 |
| |/ | |||||
* | | Merge branch 'dp/remove-duplicated-header-inclusion' into maint | Junio C Hamano | 2015-03-05 | 1 | -1/+0 |
|\ \ | |||||
| * | | do not include the same header twice | Дилян Палаузов | 2015-02-13 | 1 | -1/+0 |
* | | | Merge branch 'jc/apply-ws-fix-expands' into maint | Junio C Hamano | 2015-02-25 | 1 | -3/+28 |
|\ \ \ | |||||
| * | | | apply: count the size of postimage correctly | Junio C Hamano | 2015-01-22 | 1 | -2/+21 |
| * | | | apply: make update_pre_post_images() sanity check the given postlen | Junio C Hamano | 2015-01-22 | 1 | -0/+6 |
| * | | | apply.c: typofix | Junio C Hamano | 2015-01-22 | 1 | -1/+1 |
* | | | | Merge branch 'mg/commit-author-no-match-malformed-message' into maint | Junio C Hamano | 2015-02-25 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | commit: reword --author error message | Michael J Gruber | 2015-01-27 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'dk/format-patch-ignore-diff-submodule' into maint | Junio C Hamano | 2015-02-25 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | format-patch: ignore diff.submodule setting | Doug Kelly | 2015-01-08 | 1 | -1/+1 |
* | | | | | Merge branch 'jk/blame-commit-label' into maint | Junio C Hamano | 2015-02-25 | 3 | -24/+15 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | blame.c: fix garbled error message | Lukas Fleischer | 2015-01-13 | 1 | -5/+7 |
| * | | | | builtin/commit.c: use xstrdup_or_null instead of envdup | Jeff King | 2015-01-13 | 1 | -9/+3 |
| * | | | | builtin/apply.c: use xstrdup_or_null instead of null_strdup | Jeff King | 2015-01-13 | 1 | -10/+5 |
* | | | | | Merge branch 'ak/cat-file-clean-up' | Junio C Hamano | 2015-01-22 | 1 | -2/+0 |
|\ \ \ \ \ | |||||
| * | | | | | cat-file: use "type" and "size" from outer scope | Alexander Kuleshov | 2015-01-13 | 1 | -2/+0 |
| * | | | | | Merge branch 'mg/add-ignore-errors' into maint | Junio C Hamano | 2015-01-12 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'ak/show-branch-usage-string' | Junio C Hamano | 2015-01-21 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | show-branch: fix indentation of usage string | Ralf Thielow | 2015-01-21 | 1 | -3/+3 |
* | | | | | | | Merge branch 'rc/for-each-ref-tracking' | Junio C Hamano | 2015-01-14 | 1 | -2/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | for-each-ref: always check stat_tracking_info()'s return value | Raphael Kubo da Costa | 2015-01-13 | 1 | -2/+9 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ak/fewer-includes' | Junio C Hamano | 2015-01-14 | 1 | -4/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cat-file: remove unused includes | Alexander Kuleshov | 2015-01-10 | 1 | -4/+0 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ak/show-branch-usage-string' | Junio C Hamano | 2015-01-14 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | show-branch: line-wrap show-branch usage | Alexander Kuleshov | 2015-01-08 | 1 | -1/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'km/log-usage-string-i18n' | Junio C Hamano | 2015-01-14 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | log.c: fix translation markings | Kyle J. McKay | 2015-01-06 | 1 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'js/remote-add-with-insteadof' | Junio C Hamano | 2015-01-14 | 1 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git remote: allow adding remotes agreeing with url.<...>.insteadOf | Johannes Schindelin | 2014-12-23 | 1 | -1/+3 |
* | | | | | | | Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository' | Junio C Hamano | 2015-01-12 | 1 | -1/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pack-objects: use --objects-edge-aggressive for shallow repos | brian m. carlson | 2014-12-29 | 1 | -1/+6 |
| * | | | | | | | rev-list: add an option to mark fewer edges as uninteresting | brian m. carlson | 2014-12-29 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'rs/simplify-parsing-commit-tree-S' | Junio C Hamano | 2015-01-12 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | commit-tree: simplify parsing of option -S using skip_prefix() | René Scharfe | 2014-12-29 | 1 | -3/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rs/plug-strbuf-leak-in-merge' | Junio C Hamano | 2015-01-12 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge: release strbuf after use in suggest_conflicts() | René Scharfe | 2014-12-29 | 1 | -0/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'es/checkout-index-temp' | Junio C Hamano | 2015-01-12 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout-index: fix --temp relative path mangling | Eric Sunshine | 2014-12-29 | 1 | -8/+8 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/merge-bases' | Junio C Hamano | 2015-01-07 | 3 | -5/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | get_merge_bases(): always clean-up object flags | Junio C Hamano | 2014-10-30 | 3 | -5/+5 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jc/clone-borrow' | Junio C Hamano | 2015-01-07 | 1 | -0/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | clone: --dissociate option to mark that reference is only temporary | Junio C Hamano | 2014-10-15 | 1 | -0/+20 |
* | | | | | | | | | Merge branch 'mh/update-ref-verify' | Junio C Hamano | 2014-12-29 | 1 | -9/+5 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | update-ref: fix "verify" command with missing <oldvalue> | Michael Haggerty | 2014-12-11 | 1 | -9/+5 |
* | | | | | | | | | Sync with maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'jk/push-simple' into maint | Junio C Hamano | 2014-12-22 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ |