summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* t7600: fix typo in test titlemv/merge-ff-tristateJunio C Hamano2013-07-231-1/+1
* merge: handle --ff/--no-ff/--ff-only as a tri-state optionMiklos Vajna2013-07-021-3/+9
* Merge branch 'maint'Junio C Hamano2013-06-301-2/+2
|\
| * test: spell 'ls-files --delete' option correctly in test descriptionsSZEDER Gábor2013-06-301-2/+2
| * Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintJunio C Hamano2013-06-281-0/+7
| |\
| * \ Merge branch 'ks/difftool-dir-diff-copy-fix' into maintJunio C Hamano2013-06-271-0/+19
| |\ \
| * \ \ Merge branch 'fc/show-branch-in-rebase-am' into maintJunio C Hamano2013-06-271-1/+1
| |\ \ \
| * \ \ \ Merge branch 'rs/commit-m-no-edit' into maintJunio C Hamano2013-06-271-0/+17
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/strbuf-branchname-fix' into maintJunio C Hamano2013-06-271-2/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'mk/combine-diff-context-horizon-fix' into maintJunio C Hamano2013-06-271-0/+48
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'kb/ancestry-path-threedots' into maintJunio C Hamano2013-06-271-1/+20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mh/fetch-into-shallow' into maintJunio C Hamano2013-06-271-0/+14
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-06-274-5/+173
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'ap/diff-ignore-blank-lines'Junio C Hamano2013-06-301-0/+345
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff: add --ignore-blank-lines optionAntoine Pelisse2013-06-191-0/+345
* | | | | | | | | | | | Merge branch 'jk/submodule-subdirectory-ok'Junio C Hamano2013-06-306-173/+538
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | submodule: drop the top-level requirementJohn Keeping2013-06-175-0/+219
| * | | | | | | | | | | | rev-parse: add --prefix optionJohn Keeping2013-06-171-0/+96
| * | | | | | | | | | | | t7403: add missing && chainingJohn Keeping2013-06-171-2/+2
| * | | | | | | | | | | | t7403: modernize styleJohn Keeping2013-06-171-133/+183
| * | | | | | | | | | | | t7401: make indentation consistentJohn Keeping2013-06-171-40/+40
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'mt/send-email-cc-match-fix'Junio C Hamano2013-06-271-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | send-email: sanitize author when writing From lineMichael S. Tsirkin2013-06-201-1/+1
| * | | | | | | | | | | | send-email: add test for duplicate utf8 nameMichael S. Tsirkin2013-06-201-0/+14
* | | | | | | | | | | | | Merge branch 'jk/pull-into-dirty-unborn'Junio C Hamano2013-06-271-0/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pull: merge into unborn by fast-forwarding from empty treeThomas Rast2013-06-201-0/+29
* | | | | | | | | | | | | | Merge branch 'bc/checkout-tracking-name-plug-leak'Junio C Hamano2013-06-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t/t9802: explicitly name the upstream branch to use as a baseBrandon Casey2013-06-181-2/+2
* | | | | | | | | | | | | | | Merge branch 'rr/rebase-stash-store'Junio C Hamano2013-06-271-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | stash: introduce 'git stash store'Ramkumar Ramachandra2013-06-171-0/+19
* | | | | | | | | | | | | | | | Merge branch 'tr/maint-apply-non-git-patch-parsefix'Junio C Hamano2013-06-261-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | apply: carefully strdup a possibly-NULL nameThomas Rast2013-06-211-0/+14
* | | | | | | | | | | | | | | | | Merge branch 'vl/typofix'Junio C Hamano2013-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | random typofixes (committed missing a 't', successful missing an 's')Veres Lajos2013-06-191-1/+1
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'fg/submodule-non-ascii-path'Junio C Hamano2013-06-261-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t7400: test of UTF-8 submodule names pass under Mac OSTorsten Bögershausen2013-06-201-8/+11
| * | | | | | | | | | | | | | | | | handle multibyte characters in nameFredrik Gustafsson2013-06-141-0/+12
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rr/am-quit-empty-then-abort-fix'Junio C Hamano2013-06-241-17/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t/am: use test_path_is_missing() where appropriateRamkumar Ramachandra2013-06-171-17/+17
| * | | | | | | | | | | | | | | | | am: handle stray $dotest directoryRamkumar Ramachandra2013-06-171-0/+6
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rt/cherry-pick-continue-advice-in-status'Junio C Hamano2013-06-241-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | wt-status: give better advice when cherry-pick is in progressRalf Thielow2013-06-171-2/+4
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'dk/maint-t5150-dirname'Junio C Hamano2013-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | tests: allow sha1's as part of the pathDennis Kaarsemaker2013-06-171-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano2013-06-242-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | rebase: use peel_committish() where appropriateRamkumar Ramachandra2013-06-142-2/+2
| * | | | | | | | | | | | | | | | | | t/rebase: add failing tests for a peculiar revisionRamkumar Ramachandra2013-06-142-0/+22
* | | | | | | | | | | | | | | | | | | Merge branch 'mm/rm-coalesce-errors'Junio C Hamano2013-06-241-0/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | rm: introduce advice.rmHints to shorten messagesMathieu Lienard--Mayor2013-06-121-0/+29
| * | | | | | | | | | | | | | | | | | | rm: better error message on failure for multiple filesMathieu Lienard--Mayor2013-06-121-0/+67
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |