summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* t7500: fix flipped actual/expectAndrew Pimlott2013-07-011-3/+3
* lib-rebase: document exec_ in FAKE_LINESAndrew Pimlott2013-07-011-0/+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
|\
| * fetch-pack: prepare updated shallow file before fetching the packNguyễn Thái Ngọc Duy2013-05-281-0/+7
* | Merge branch 'ks/difftool-dir-diff-copy-fix' into maintJunio C Hamano2013-06-271-0/+19
|\ \
| * | difftool --dir-diff: allow changing any clean working tree fileKenichi Saita2013-05-291-0/+19
* | | Merge branch 'fc/show-branch-in-rebase-am' into maintJunio C Hamano2013-06-271-1/+1
|\ \ \
| * | | prompt: fix for simple rebaseFelipe Contreras2013-05-291-1/+1
| |/ /
* | | Merge branch 'rs/commit-m-no-edit' into maintJunio C Hamano2013-06-271-0/+17
|\ \ \
| * | | commit: don't start editor if empty message is given with -mRené Scharfe2013-05-281-0/+17
* | | | Merge branch 'jc/strbuf-branchname-fix' into maintJunio C Hamano2013-06-271-2/+13
|\ \ \ \
| * | | | strbuf_branchname(): do not double-expand @{-1}~22Junio C Hamano2013-05-161-2/+13
* | | | | Merge branch 'mk/combine-diff-context-horizon-fix' into maintJunio C Hamano2013-06-271-0/+48
|\ \ \ \ \
| * | | | | combine-diff.c: Fix output when changes are exactly 3 lines apartMatthijs Kooijman2013-05-151-0/+48
* | | | | | Merge branch 'kb/ancestry-path-threedots' into maintJunio C Hamano2013-06-271-1/+20
|\ \ \ \ \ \
| * | | | | | revision.c: treat A...B merge bases as if manually specifiedKevin Bracey2013-05-161-1/+1
| * | | | | | t6019: demonstrate --ancestry-path A...B breakageKevin Bracey2013-05-131-1/+20
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mh/fetch-into-shallow' into maintJunio C Hamano2013-06-271-0/+14
|\ \ \ \ \ \
| * | | | | | t5500: add test for fetching with an unknown 'shallow'Michael Heemskerk2013-05-021-0/+14
* | | | | | | Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-06-274-5/+173
|\ \ \ \ \ \ \
| * | | | | | | branch.c: Validate tracking branches with refspecs instead of refs/remotes/*Johan Herland2013-04-212-2/+2
| * | | | | | | t9114.2: Don't use --track option against "svn-remote"-tracking branchesJohan Herland2013-04-211-1/+1
| * | | | | | | t7201.24: Add refspec to keep --track workingJohan Herland2013-04-211-0/+1
| * | | | | | | t3200.39: tracking setup should fail if there is no matching refspec.Johan Herland2013-04-211-4/+4
| * | | | | | | checkout: Use remote refspecs when DWIMming tracking branchesJohan Herland2013-04-211-3/+3
| * | | | | | | t2024: Show failure to use refspec when DWIMming remote branch namesJohan Herland2013-04-211-1/+69
| * | | | | | | t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'Johan Herland2013-04-211-0/+99
* | | | | | | | Merge branch 'maint-1.8.2' into maintJunio C Hamano2013-06-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t0070 "mktemp to unwritable directory" needs SANITYTorsten Bögershausen2013-06-111-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'kb/status-ignored-optim-2' into maintJunio C Hamano2013-06-091-0/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | dir.c: fix ignore processing within not-ignored directoriesKarsten Blees2013-06-021-0/+18
* | | | | | | | | t/README: test_must_fail is for testing GitJunio C Hamano2013-06-041-0/+3
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | git-svn: introduce --parents parameter for commands branch and tagTobias Schulte2013-05-201-0/+48
* | | | | | | | difftool: fix dir-diff when file does not exist in working treeJohn Keeping2013-05-171-0/+7
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2013-05-112-1/+149
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | git-svn: added an --include-path flagPaul Walmsley2013-05-091-0/+149
| * | | | | | git-svn: avoid self-referencing mergeinfoMichael Contreras2013-05-091-1/+0
* | | | | | | Sync with v1.8.2.3Junio C Hamano2013-05-091-4/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | t5004: avoid using tar for checking emptiness of archiveRené Scharfe2013-05-091-3/+2
| * | | | | t5004: ignore pax global header fileRené Scharfe2013-05-091-1/+1
* | | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-05-061-0/+51
|\ \ \ \ \ \
| * | | | | | merge-tree: handle directory/empty conflict correctlyJohn Keeping2013-05-061-0/+51
* | | | | | | Merge branch 'fc/push-with-export-reporting-result'Junio C Hamano2013-05-051-0/+14
|\ \ \ \ \ \ \
| * | | | | | | transport-helper: improve push messagesFelipe Contreras2013-05-051-0/+14
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'tr/remote-tighten-commandline-parsing' into maintJunio C Hamano2013-05-031-0/+22
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'tr/remote-tighten-commandline-parsing'Junio C Hamano2013-05-011-0/+22
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | remote: 'show' and 'prune' can take more than one remoteThomas Rast2013-04-241-8/+3
| * | | | | | | remote: check for superfluous arguments in 'git remote add'Thomas Rast2013-04-241-1/+1
| * | | | | | | remote: add a test for extra arguments, according to docsThomas Rast2013-04-241-0/+27