Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | strbuf_getwholeline: NUL-terminate getdelim buffer on error | Jeff King | 2016-03-05 | 1 | -0/+4 |
* | Merge branch 'js/test-lib-windows-emulated-yes' into maint | Junio C Hamano | 2016-02-17 | 1 | -2/+4 |
|\ | |||||
| * | test-lib: limit the output of the yes utility | Johannes Schindelin | 2016-02-02 | 1 | -2/+4 |
* | | Merge branch 'aw/push-force-with-lease-reporting' into maint | Junio C Hamano | 2016-02-17 | 1 | -5/+10 |
|\ \ | |||||
| * | | push: fix ref status reporting for --force-with-lease | Andrew Wheeler | 2016-02-02 | 1 | -5/+10 |
| |/ | |||||
* | | Merge branch 'js/xmerge-marker-eol' into maint | Junio C Hamano | 2016-02-17 | 1 | -0/+13 |
|\ \ | |||||
| * | | merge-file: ensure that conflict sections match eol style | Johannes Schindelin | 2016-01-27 | 1 | -1/+2 |
| * | | merge-file: let conflict markers match end-of-line style of the context | Johannes Schindelin | 2016-01-27 | 1 | -0/+12 |
* | | | Merge branch 'sg/t6050-failing-editor-test-fix' into maint | Junio C Hamano | 2016-02-05 | 1 | -3/+7 |
|\ \ \ | |||||
| * | | | t6050-replace: make failing editor test more robust | SZEDER Gábor | 2016-01-05 | 1 | -3/+7 |
* | | | | Merge branch 'jk/ref-cache-non-repository-optim' into maint | Junio C Hamano | 2016-02-05 | 2 | -0/+11 |
|\ \ \ \ | |||||
| * | | | | resolve_gitlink_ref: ignore non-repository paths | Jeff King | 2016-01-25 | 2 | -0/+11 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'js/dirname-basename' into maint | Junio C Hamano | 2016-02-05 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | t0060: verify that basename() and dirname() work as expected | Johannes Schindelin | 2016-01-12 | 1 | -0/+3 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'nd/diff-with-path-params' into maint | Junio C Hamano | 2016-02-05 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | diff: make -O and --output work in subdirectory | Duy Nguyen | 2016-01-21 | 1 | -0/+6 |
| |/ / / | |||||
| * | | | Merge branch 'jk/pending-keep-tag-name' into maint | Junio C Hamano | 2016-01-04 | 1 | -0/+29 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/symbolic-ref-maint' into maint | Junio C Hamano | 2016-01-04 | 1 | -0/+22 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'jk/list-tag-2.7-regression' into maint | Junio C Hamano | 2016-02-05 | 3 | -52/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tag: do not show ambiguous tag names as "tags/foo" | Jeff King | 2016-01-26 | 3 | -0/+28 |
| * | | | | | | t6300: use test_atom for some un-modern tests | Jeff King | 2016-01-25 | 1 | -52/+10 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/sanity' into maint | Junio C Hamano | 2016-02-05 | 1 | -5/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | test-lib: clarify and tighten SANITY | Junio C Hamano | 2016-01-19 | 1 | -5/+13 |
* | | | | | | | Merge branch 'jk/filter-branch-no-index' into maint | Junio C Hamano | 2016-02-05 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | filter-branch: resolve $commit^{tree} in no-index case | Jeff King | 2016-01-19 | 1 | -0/+8 |
* | | | | | | | | Merge branch 'js/close-packs-before-gc' into maint | Junio C Hamano | 2016-02-05 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fetch: release pack files before garbage-collecting | Johannes Schindelin | 2016-01-13 | 1 | -0/+13 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/exclusion-regression-fix' into maint | Junio C Hamano | 2016-02-05 | 1 | -25/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match" | Nguyễn Thái Ngọc Duy | 2016-01-08 | 1 | -25/+0 |
* | | | | | | | | | Merge branch 'dk/reflog-walk-with-non-commit' into maint | Junio C Hamano | 2016-02-05 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | reflog-walk: don't segfault on non-commit sha1's in the reflog | Dennis Kaarsemaker | 2016-01-05 | 1 | -0/+13 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'ls/p4-keep-empty-commits' into maint | Junio C Hamano | 2015-12-15 | 1 | -0/+134 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch 'ew/send-email-mutt-alias-fix' into maint | Junio C Hamano | 2016-02-05 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-send-email: do not double-escape quotes from mutt | Eric Wong | 2016-01-04 | 1 | -0/+15 |
* | | | | | | | | | | | Merge branch 'nd/stop-setenv-work-tree' into maint | Junio C Hamano | 2016-02-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR" | Nguyễn Thái Ngọc Duy | 2015-12-22 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'sh/p4-multi-depot' | Junio C Hamano | 2015-12-28 | 1 | -1/+27 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-p4: reduce number of server queries for fetches | Sam Hocevar | 2015-12-21 | 1 | -1/+1 |
| * | | | | | | | | | | | git-p4: failing test case for skipping changes with multiple depots | Luke Diamand | 2015-12-14 | 1 | -1/+27 |
* | | | | | | | | | | | | Merge branch 'jk/pending-keep-tag-name' | Junio C Hamano | 2015-12-28 | 1 | -0/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | revision.c: propagate tag names from pending array | Jeff King | 2015-12-17 | 1 | -0/+29 |
* | | | | | | | | | | | | Merge branch 'jk/symbolic-ref-maint' | Junio C Hamano | 2015-12-28 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | t1401: test reflog creation for git-symbolic-ref | Jeff King | 2015-12-21 | 1 | -0/+16 |
| * | | | | | | | | | | | symbolic-ref: propagate error code from create_symref() | Jeff King | 2015-12-21 | 1 | -0/+6 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'bc/format-patch-null-from-line' | Junio C Hamano | 2015-12-21 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | format-patch: check that header line has expected format | brian m. carlson | 2015-12-15 | 1 | -0/+7 |
| * | | | | | | | | | | | format-patch: add an option to suppress commit hash | brian m. carlson | 2015-12-15 | 1 | -0/+7 |
* | | | | | | | | | | | | Merge branch 'mc/push-recurse-submodules-config' | Junio C Hamano | 2015-12-21 | 1 | -1/+216 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | push: follow the "last one wins" convention for --recurse-submodules | Mike Crowe | 2015-12-04 | 1 | -0/+41 |
| * | | | | | | | | | | | | push: test that --recurse-submodules on command line overrides config | Mike Crowe | 2015-12-04 | 1 | -4/+28 |