aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'nd/worktree-lock'Junio C Hamano2016-07-28
|\
| * worktree: add "unlock" commandNguyễn Thái Ngọc Duy2016-07-08
| * worktree: add "lock" commandNguyễn Thái Ngọc Duy2016-07-08
* | Merge branch 'js/rebase-i-tests'Junio C Hamano2016-07-28
|\ \
| * | rebase -i: we allow extra spaces after fixup!/squash!Johannes Schindelin2016-07-07
| * | rebase -i: demonstrate a bug with --autosquashJohannes Schindelin2016-07-07
| * | t3404: add a test for the --gpg-sign optionJohannes Schindelin2016-07-07
* | | Merge branch 'mh/blame-worktree'Junio C Hamano2016-07-25
|\ \ \
| * | | t/t8003-blame-corner-cases.sh: Use here documentsMike Hommey2016-07-18
| * | | blame: allow to blame paths freshly added to the indexMike Hommey2016-07-18
* | | | Merge branch 'js/fsck-name-object'Junio C Hamano2016-07-25
|\ \ \ \
| * | | | fsck: optionally show more helpful info for broken linksJohannes Schindelin2016-07-18
* | | | | Merge branch 'nd/cache-tree-ita'Junio C Hamano2016-07-25
|\ \ \ \ \
| * | | | | cache-tree: do not generate empty trees as a result of all i-t-a subentriesNguyễn Thái Ngọc Duy2016-07-18
| * | | | | cache-tree.c: fix i-t-a entry skipping directory updates sometimesNguyễn Thái Ngọc Duy2016-07-18
| * | | | | test-lib.sh: introduce and use $EMPTY_BLOBNguyễn Thái Ngọc Duy2016-07-18
| * | | | | test-lib.sh: introduce and use $EMPTY_TREENguyễn Thái Ngọc Duy2016-07-18
* | | | | | Merge branch 'jk/push-scrub-url'Junio C Hamano2016-07-25
|\ \ \ \ \ \
| * | | | | | t5541: fix url scrubbing test when GPG is not setJeff King2016-07-20
| * | | | | | push: anonymize URL in status outputJeff King2016-07-14
* | | | | | | Merge branch 'nd/test-helpers'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \
| * | | | | | | t/test-lib.sh: fix running tests with --valgrindJohannes Schindelin2016-07-11
* | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: avoid "safer crlf" during recording of merge resultsJunio C Hamano2016-07-12
| * | | | | | | | convert: unify the "auto" handling of CRLFTorsten Bögershausen2016-07-06
* | | | | | | | | Merge branch 'js/ignore-space-at-eol'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: fix a double off-by-one with --ignore-space-at-eolJohannes Schindelin2016-07-11
| * | | | | | | | | diff: demonstrate a bug with --patience and --ignore-space-at-eolJohannes Schindelin2016-07-11
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mh/update-ref-errors'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | lock_ref_for_update(): make error handling more uniformMichael Haggerty2016-06-20
| * | | | | | | | | t1404: add more tests of update-ref error handlingMichael Haggerty2016-06-20
| * | | | | | | | | t1404: document function test_update_rejectedMichael Haggerty2016-06-20
| * | | | | | | | | t1404: remove "prefix" argument to test_update_rejectedMichael Haggerty2016-06-20
| * | | | | | | | | t1404: rename file to t1404-update-ref-errors.shMichael Haggerty2016-06-20
* | | | | | | | | | Merge branch 'mh/split-under-lock'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | refs: resolve symbolic refs firstMichael Haggerty2016-06-13
| * | | | | | | | | ref_transaction_update(): check refname_is_safe() at a minimumMichael Haggerty2016-06-13
| * | | | | | | | | refs: don't dereference on renameDavid Turner2016-06-13
| * | | | | | | | | refs: make error messages more consistentMichael Haggerty2016-06-13
| * | | | | | | | | read_raw_ref(): don't get confused by an empty directoryMichael Haggerty2016-05-05
| * | | | | | | | | t1404: demonstrate a bug resolving referencesMichael Haggerty2016-05-05
* | | | | | | | | | Merge branch 'ls/p4-tmp-refs'Junio C Hamano2016-07-19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: place temporary refs used for branch import under refs/git-p4-tmpLars Schneider2016-07-08
* | | | | | | | | | | Merge branch 'nd/fetch-ref-summary'Junio C Hamano2016-07-19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fetch: reduce duplicate in ref update status lines with placeholderNguyễn Thái Ngọc Duy2016-07-06
| * | | | | | | | | | | fetch: align all "remote -> local" outputNguyễn Thái Ngọc Duy2016-07-06
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/test-match-signal'Junio C Hamano2016-07-19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t/lib-git-daemon: use test_match_signalJeff King2016-07-06
| * | | | | | | | | | | test_must_fail: use test_match_signalJeff King2016-07-06
| * | | | | | | | | | | t0005: use test_match_signal as appropriateJeff King2016-07-06