summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* A few more options for git-cat-fileH. Peter Anvin2005-12-032-18/+42
* Add compat/setenv.c, use in git.c.Jason Riedy2005-12-033-9/+53
* New test case: Criss-cross mergeFredrik Kuivinen2005-12-031-0/+92
* New test case: merge with directory/file conflictsFredrik Kuivinen2005-12-031-0/+25
* test-lib.sh: Add new function, test_expect_codeFredrik Kuivinen2005-12-031-0/+13
* git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen2005-12-031-1/+2
* documentation: git-tagNo name2005-12-021-1/+21
* documentation: git-bisect (help HTML break man)Junio C Hamano2005-12-021-7/+7
* documentation: clarify read-tree --resetNo name2005-12-021-4/+6
* git-merge documentation: conflicting merge leaves higher stages in indexJunio C Hamano2005-12-021-4/+6
* merge-one-file: make sure we do not mismerge symbolic links.Junio C Hamano2005-12-021-0/+8
* merge-one-file: make sure we create the merged file.Junio C Hamano2005-12-021-1/+7
* t3100: add ls-tree -t and -d tests.Junio C Hamano2005-12-011-0/+38
* merge-recursive: adjust git-ls-tree use for the latest.Junio C Hamano2005-12-011-1/+1
* git wrapper: more careful argument stuffingAlex Riesen2005-12-011-7/+12
* git-merge-one-file: do not worry about 'rmdir -p' not removing directory.Junio C Hamano2005-12-011-1/+1
* ls-tree: --name-onlyJunio C Hamano2005-12-011-2/+11
* ls-tree: resurrect '-d' to mean 'show trees only'Junio C Hamano2005-12-011-0/+6
* git-ls-tree: add "-t" option to always show the tree entriesLinus Torvalds2005-12-011-24/+41
* Makefile: say the default target upfront.Junio C Hamano2005-12-011-0/+3
* Documentation: describe '-f' option to git-fetch.Junio C Hamano2005-12-011-0/+5
* Move couple of ifdefs after "include config.mk"Timo Hirvonen2005-11-301-16/+12
* Merge branch 'jc/subdir'Junio C Hamano2005-11-3038-20/+168
|\
| * hash-object.c: type-fix to squelch compiler warnings.Junio C Hamano2005-11-281-2/+2
| * define die() for scripts that use it.Junio C Hamano2005-11-286-0/+30
| * verify-tag: make it operable from a subdirectory.Junio C Hamano2005-11-281-4/+8
| * tag: make it operable from a subdirectory.Junio C Hamano2005-11-281-1/+1
| * lost-found: make it operable from a subdirectory.Junio C Hamano2005-11-281-2/+1
| * branch: make it operable from a subdirectory.Junio C Hamano2005-11-281-4/+2
| * ls-remote: define die() now we do not use git-sh-setupJunio C Hamano2005-11-281-0/+5
| * count-objects: make it operable from a subdirectory.Junio C Hamano2005-11-281-1/+1
| * Make the rest of commands work from a subdirectory.Junio C Hamano2005-11-2814-1/+29
| * Make networking commands to work from a subdirectory.Junio C Hamano2005-11-288-0/+15
| * ls-tree: work from subdirectory.Junio C Hamano2005-11-281-5/+14
| * hash-object: work within subdirectory.Junio C Hamano2005-11-281-3/+15
| * checkout-index: work from subdirectory.Junio C Hamano2005-11-281-1/+11
| * fsck-objects: work from subdirectory.Junio C Hamano2005-11-281-0/+2
| * peek-remote: honor proxy config even from subdirectory.Junio C Hamano2005-11-281-0/+3
| * git-apply: work from subdirectory.Junio C Hamano2005-11-281-0/+18
| * working from subdirectory: preparationJunio C Hamano2005-11-282-3/+27
| |
| \
| \
| \
| \
| \
*-----. \ Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect' and 'lt/merge'Junio C Hamano2005-11-3016-320/+215
|\ \ \ \ \
| | | | * | Tutorial: adjust merge example to recursive strategy.Junio C Hamano2005-11-301-8/+7
| | | | * | merge-recursive: match the unmerged index entry behaviour with merge-resolveJunio C Hamano2005-11-301-2/+0
| | | | * | diff-files: show diffs with stage0 and unmerged stage at the same time.Junio C Hamano2005-11-302-23/+5
| | | | * | merge-one-file: leave unmerged index entries upon automerge failure.Linus Torvalds2005-11-301-5/+1
| | | | * | diff-files: -1/-2/-3 to diff against unmerged stage.Linus Torvalds2005-11-302-8/+64
| | | * | | bisect: quote pathnames for eval safety.Junio C Hamano2005-11-281-5/+20
| | | * | | bisect: limit the searchspace by pathspecsLinus Torvalds2005-11-282-11/+17
| | | | |/ | | | |/|
| | * | | ls-tree: match the test to the new semantics.Junio C Hamano2005-11-283-56/+22
| | * | | ls-tree: Resurrect funny name quoting lost during rewrite.Junio C Hamano2005-11-281-1/+3
View Lorry Controller Status