Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'mh/blame-worktree' | Junio C Hamano | 2016-07-25 |
|\ | |||
| * | t/t8003-blame-corner-cases.sh: Use here documents | Mike Hommey | 2016-07-18 |
| * | blame: allow to blame paths freshly added to the index | Mike Hommey | 2016-07-18 |
* | | Merge branch 'js/fsck-name-object' | Junio C Hamano | 2016-07-25 |
|\ \ | |||
| * | | fsck: optionally show more helpful info for broken links | Johannes Schindelin | 2016-07-18 |
* | | | Merge branch 'nd/cache-tree-ita' | Junio C Hamano | 2016-07-25 |
|\ \ \ | |||
| * | | | cache-tree: do not generate empty trees as a result of all i-t-a subentries | Nguyễn Thái Ngọc Duy | 2016-07-18 |
| * | | | cache-tree.c: fix i-t-a entry skipping directory updates sometimes | Nguyễn Thái Ngọc Duy | 2016-07-18 |
| * | | | test-lib.sh: introduce and use $EMPTY_BLOB | Nguyễn Thái Ngọc Duy | 2016-07-18 |
| * | | | test-lib.sh: introduce and use $EMPTY_TREE | Nguyễn Thái Ngọc Duy | 2016-07-18 |
* | | | | Merge branch 'jk/push-scrub-url' | Junio C Hamano | 2016-07-25 |
|\ \ \ \ | |||
| * | | | | t5541: fix url scrubbing test when GPG is not set | Jeff King | 2016-07-20 |
| * | | | | push: anonymize URL in status output | Jeff King | 2016-07-14 |
* | | | | | Merge branch 'nd/test-helpers' | Junio C Hamano | 2016-07-25 |
|\ \ \ \ \ | |||
| * | | | | | t/test-lib.sh: fix running tests with --valgrind | Johannes Schindelin | 2016-07-11 |
* | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' | Junio C Hamano | 2016-07-25 |
|\ \ \ \ \ \ | |||
| * | | | | | | merge: avoid "safer crlf" during recording of merge results | Junio C Hamano | 2016-07-12 |
| * | | | | | | convert: unify the "auto" handling of CRLF | Torsten Bögershausen | 2016-07-06 |
* | | | | | | | Merge branch 'js/ignore-space-at-eol' | Junio C Hamano | 2016-07-25 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | diff: fix a double off-by-one with --ignore-space-at-eol | Johannes Schindelin | 2016-07-11 |
| * | | | | | | | diff: demonstrate a bug with --patience and --ignore-space-at-eol | Johannes Schindelin | 2016-07-11 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'mh/update-ref-errors' | Junio C Hamano | 2016-07-25 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | lock_ref_for_update(): make error handling more uniform | Michael Haggerty | 2016-06-20 |
| * | | | | | | | t1404: add more tests of update-ref error handling | Michael Haggerty | 2016-06-20 |
| * | | | | | | | t1404: document function test_update_rejected | Michael Haggerty | 2016-06-20 |
| * | | | | | | | t1404: remove "prefix" argument to test_update_rejected | Michael Haggerty | 2016-06-20 |
| * | | | | | | | t1404: rename file to t1404-update-ref-errors.sh | Michael Haggerty | 2016-06-20 |
* | | | | | | | | Merge branch 'mh/split-under-lock' | Junio C Hamano | 2016-07-25 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||
| * | | | | | | | refs: resolve symbolic refs first | Michael Haggerty | 2016-06-13 |
| * | | | | | | | ref_transaction_update(): check refname_is_safe() at a minimum | Michael Haggerty | 2016-06-13 |
| * | | | | | | | refs: don't dereference on rename | David Turner | 2016-06-13 |
| * | | | | | | | refs: make error messages more consistent | Michael Haggerty | 2016-06-13 |
| * | | | | | | | read_raw_ref(): don't get confused by an empty directory | Michael Haggerty | 2016-05-05 |
| * | | | | | | | t1404: demonstrate a bug resolving references | Michael Haggerty | 2016-05-05 |
* | | | | | | | | Merge branch 'ls/p4-tmp-refs' | Junio C Hamano | 2016-07-19 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git-p4: place temporary refs used for branch import under refs/git-p4-tmp | Lars Schneider | 2016-07-08 |
* | | | | | | | | | Merge branch 'nd/fetch-ref-summary' | Junio C Hamano | 2016-07-19 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | fetch: reduce duplicate in ref update status lines with placeholder | Nguyễn Thái Ngọc Duy | 2016-07-06 |
| * | | | | | | | | | fetch: align all "remote -> local" output | Nguyễn Thái Ngọc Duy | 2016-07-06 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jk/test-match-signal' | Junio C Hamano | 2016-07-19 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t/lib-git-daemon: use test_match_signal | Jeff King | 2016-07-06 |
| * | | | | | | | | | test_must_fail: use test_match_signal | Jeff King | 2016-07-06 |
| * | | | | | | | | | t0005: use test_match_signal as appropriate | Jeff King | 2016-07-06 |
| * | | | | | | | | | tests: factor portable signal check out of t0005 | Jeff King | 2016-07-06 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'jk/common-main' | Junio C Hamano | 2016-07-19 |
|\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/common-main-2.8' into jk/common-main | Junio C Hamano | 2016-07-06 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | |||
| | * | | | | | | | Merge branch 'da/difftool' into maint | Junio C Hamano | 2016-06-06 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge branch 'tb/core-eol-fix' into maint | Junio C Hamano | 2016-06-06 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | |||
| | * | | | | | | | | Merge branch 'ar/diff-args-osx-precompose' into maint | Junio C Hamano | 2016-06-06 |
| | |\ \ \ \ \ \ \ \ | |||
* | | \ \ \ \ \ \ \ \ | Merge branch 'ak/lazy-prereq-mktemp' | Junio C Hamano | 2016-07-19 |
|\ \ \ \ \ \ \ \ \ \ \ |