summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* describe: Break annotated tag ties by tagger dateShawn O. Pearce2010-04-131-3/+5
* Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6Junio C Hamano2010-03-072-0/+4
|\
| * lib-patch-mode.sh: Fix permissionJunio C Hamano2010-01-301-0/+2
| * Merge commit 'b319ef7' into jc/maint-fix-test-permJunio C Hamano2010-01-30599-3731/+44753
| |\
| * | t6000lib: Fix permissionJunio C Hamano2010-01-301-0/+2
* | | Merge branch 'sp/maint-push-sideband' into maint-1.6.6Junio C Hamano2010-03-071-41/+42
|\ \ \
| * | | receive-pack: Send internal errors over side-band #2Shawn O. Pearce2010-02-101-1/+2
| * | | t5401: Use a bare repository for the remote peerShawn O. Pearce2010-02-091-29/+29
| * | | receive-pack: Send hook output over side band #2Shawn O. Pearce2010-02-051-11/+11
* | | | Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6Junio C Hamano2010-03-071-0/+8
|\ \ \ \
| * | | | rm: fix bug in recursive subdirectory removalJeff King2010-02-181-0/+8
* | | | | Merge branch 'cc/maint-bisect-paths' into maint-1.6.6Junio C Hamano2010-03-071-0/+5
|\ \ \ \ \
| * | | | | bisect: error out when passing bad path parametersChristian Couder2010-03-011-0/+5
* | | | | | t3301-notes: insert a shbang line in ./fake_editor.shJohannes Sixt2010-02-251-0/+1
* | | | | | Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano2010-02-161-0/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | stash pop: remove 'apply' options during 'drop' invocationThomas Rast2010-02-151-0/+9
* | | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-02-101-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | t8003: check exit code of command and error message separatelyJunio C Hamano2010-02-101-2/+4
* | | | | | Merge branch 'sp/maint-fast-import-large-blob' into maintJunio C Hamano2010-02-102-1/+47
|\ \ \ \ \ \
| * | | | | | fast-import: Stream very large blobs directly to packShawn O. Pearce2010-02-012-1/+47
* | | | | | | Merge branch 'jc/maint-reflog-bad-timestamp' into maintJunio C Hamano2010-02-101-0/+45
|\ \ \ \ \ \ \
| * | | | | | | t0101: use a fixed timestamp when searching in the reflogJunio C Hamano2010-01-271-2/+2
| * | | | | | | approxidate_careful() reports errorneous date stringJunio C Hamano2010-01-261-0/+45
* | | | | | | | Merge branch 'jh/maint-config-file-prefix' into maintJunio C Hamano2010-02-101-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin-config: Fix crash when using "-f <relative path>" from non-root dirJohan Herland2010-01-261-0/+11
* | | | | | | | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maintJunio C Hamano2010-02-101-0/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout -m path: fix recreating conflictsJunio C Hamano2010-01-061-0/+57
* | | | | | | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-02-081-0/+8
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | blame: prevent a segv when -L given start > EOFJay Soffian2010-02-081-0/+8
| * | | | | | | | | Merge branch 'sb/maint-octopus' into maint-1.6.5Junio C Hamano2010-02-011-0/+51
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | archive: simplify archive format guessingRené Scharfe2010-02-071-0/+10
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge branch 'jc/maint-limit-note-output' into maintJunio C Hamano2010-02-051-0/+59
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix "log --oneline" not to show notesJunio C Hamano2010-01-211-2/+4
| * | | | | | | | Fix "log" family not to be too agressive about showing notesJunio C Hamano2010-01-201-0/+57
* | | | | | | | | ignore duplicated slashes in make_relative_path()Junio C Hamano2010-01-221-0/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'bg/maint-remote-update-default' into maintJunio C Hamano2010-01-201-0/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix "git remote update" with remotes.defalt setBjörn Gustavsson2009-12-311-0/+14
* | | | | | | | | Merge branch 'sb/maint-octopus' into maintJunio C Hamano2010-01-201-0/+51
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | octopus: reenable fast-forward mergesStephen Boyd2009-12-131-0/+18
| * | | | | | | | octopus: make merge process simpler to followStephen Boyd2009-12-131-0/+33
* | | | | | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-201-0/+6
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5Junio C Hamano2010-01-201-0/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | reset: unbreak hard resets with GIT_WORK_TREEJeff King2009-12-301-0/+6
| * | | | | | | | | Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-01-182-20/+20
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-182-20/+20
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-182-20/+20
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2010-01-102-20/+20
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2010-01-101-13/+13
| | | | | |\ \ \ \ \ \ \ \ \
| | * | | | \ \ \ \ \ \ \ \ \ Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano2010-01-181-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fix mis-backport of t7002Junio C Hamano2010-01-181-1/+5
View Lorry Controller Status