Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'rl/remote-allow-missing-branch-name-merge' into maint | Junio C Hamano | 2017-03-21 |
|\ | |||
| * | remote: ignore failure to remove missing branch.<name>.merge | Ross Lagerwall | 2017-02-21 |
* | | Merge branch 'dt/gc-ignore-old-gc-logs' into maint | Junio C Hamano | 2017-03-21 |
|\ \ | |||
| * | | gc: ignore old gc.log files | David Turner | 2017-02-13 |
| |/ | |||
| * | Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maint | Junio C Hamano | 2017-01-31 |
| |\ | |||
| * \ | Merge branch 'km/branch-get-push-while-detached' into maint | Junio C Hamano | 2017-01-31 |
| |\ \ | |||
| * \ \ | Merge branch 'jk/blame-fixes' into maint | Junio C Hamano | 2017-01-31 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'jk/archive-zip-userdiff-config' into maint | Junio C Hamano | 2017-01-31 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'dt/disable-bitmap-in-auto-gc' into maint | Junio C Hamano | 2017-01-31 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'mh/fast-import-notes-fix-new' into maint | Junio C Hamano | 2017-01-31 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jc/compression-config' into maint | Junio C Hamano | 2017-01-31 |
| |\ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ | Merge branch 'jc/diff-populate-filespec-size-only-fix' into maint | Junio C Hamano | 2017-03-21 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec() | Junio C Hamano | 2017-03-02 |
* | | | | | | | | | | Merge branch 'js/realpath-pathdup-fix' into maint | Junio C Hamano | 2017-03-16 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | real_pathdup(): fix callsites that wanted it to die on error | Johannes Schindelin | 2017-03-08 |
| * | | | | | | | | | | t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREE | Johannes Schindelin | 2017-03-08 |
* | | | | | | | | | | | Merge branch 'ax/line-log-range-merge-fix' into maint | Junio C Hamano | 2017-03-16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | line-log.c: prevent crash during union of too many ranges | Allan Xavier | 2017-03-03 |
* | | | | | | | | | | | | Merge branch 'jk/add-i-patch-do-prompt' into maint | Junio C Hamano | 2017-03-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | add--interactive: fix missing file prompt for patch mode with "-i" | Jeff King | 2017-03-02 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | http: attempt updating base URL only if no error | Jonathan Tan | 2017-02-28 |
|/ / / / / / / / / / / | |||
* | | | | | | | | | | | Merge branch 'ls/p4-path-encoding' | Junio C Hamano | 2017-02-16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | git-p4: fix git-p4.pathEncoding for removed files | Lars Schneider | 2017-02-10 |
* | | | | | | | | | | | | Merge branch 'sb/push-options-via-transport' | Junio C Hamano | 2017-02-15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | push options: pass push options to the transport helper | Stefan Beller | 2017-02-08 |
* | | | | | | | | | | | | | Merge branch 'jk/log-graph-name-only' | Junio C Hamano | 2017-02-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | diff: print line prefix for --name-only output | Jeff King | 2017-02-08 |
* | | | | | | | | | | | | | | Merge branch 'da/t7800-cleanup' | Junio C Hamano | 2017-02-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | t7800: replace "wc -l" with test_line_count | David Aguilar | 2017-02-08 |
| * | | | | | | | | | | | | | | Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup | Junio C Hamano | 2017-02-08 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-02-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||
| * | | | | | | | | | | | | | | | t7800: simplify basic usage test | David Aguilar | 2017-02-08 |
| * | | | | | | | | | | | | | | | difftool: fix bug when printing usage | David Aguilar | 2017-02-06 |
* | | | | | | | | | | | | | | | | Merge branch 'rs/p5302-create-repositories-before-tests' | Junio C Hamano | 2017-02-10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | p5302: create repositories for index-pack results explicitly | René Scharfe | 2017-02-06 |
* | | | | | | | | | | | | | | | | Merge branch 'cw/log-updates-for-all-refs-really' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | update-ref: add test cases for bare repository | Cornelius Weig | 2017-01-31 |
| * | | | | | | | | | | | | | | | | refs: add option core.logAllRefUpdates = always | Cornelius Weig | 2017-01-31 |
* | | | | | | | | | | | | | | | | | Merge branch 'js/re-running-failed-tests' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | t/Makefile: add a rule to re-run previously-failed tests | Johannes Schindelin | 2017-01-27 |
| |/ / / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-update-initial-runs-custom-script' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | submodule update: run custom update script for initial populating as well | Stefan Beller | 2017-01-26 |
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-recursive-absorb' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | submodule absorbing: fix worktree/gitdir pointers recursively for non-moves | Stefan Beller | 2017-01-26 |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | Merge branch 'sb/unpack-trees-super-prefix' | Junio C Hamano | 2017-02-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | unpack-trees: support super-prefix option | Stefan Beller | 2017-01-25 |
| * | | | | | | | | | | | | | | | | | t1001: modernize style | Stefan Beller | 2017-01-11 |
| * | | | | | | | | | | | | | | | | | t1000: modernize style | Stefan Beller | 2017-01-11 |
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/log-graph-configurable-colors' | Junio C Hamano | 2017-02-02 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | color_parse_mem: allow empty color spec | Jeff King | 2017-01-31 |