aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* GIT 0.99.9l aka 1.0rc4v1.0rc4v0.99.9lJunio C Hamano2005-12-03
|\
| * [PATCH] daemon.c and path.enter_repo(): revamp path validation.Junio C Hamano2005-12-03
| * A few more options for git-cat-fileH. Peter Anvin2005-12-03
| * Add compat/setenv.c, use in git.c.Jason Riedy2005-12-03
| * New test case: Criss-cross mergeFredrik Kuivinen2005-12-03
| * New test case: merge with directory/file conflictsFredrik Kuivinen2005-12-03
| * test-lib.sh: Add new function, test_expect_codeFredrik Kuivinen2005-12-03
| * git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen2005-12-03
| * documentation: git-tagNo name2005-12-02
| * documentation: git-bisect (help HTML break man)Junio C Hamano2005-12-02
| * documentation: clarify read-tree --resetNo name2005-12-02
| * git-merge documentation: conflicting merge leaves higher stages in indexJunio C Hamano2005-12-02
| * merge-one-file: make sure we do not mismerge symbolic links.Junio C Hamano2005-12-02
| * merge-one-file: make sure we create the merged file.Junio C Hamano2005-12-02
| * t3100: add ls-tree -t and -d tests.Junio C Hamano2005-12-01
| * merge-recursive: adjust git-ls-tree use for the latest.Junio C Hamano2005-12-01
| * git wrapper: more careful argument stuffingAlex Riesen2005-12-01
| * git-merge-one-file: do not worry about 'rmdir -p' not removing directory.Junio C Hamano2005-12-01
| * ls-tree: --name-onlyJunio C Hamano2005-12-01
| * ls-tree: resurrect '-d' to mean 'show trees only'Junio C Hamano2005-12-01
| * git-ls-tree: add "-t" option to always show the tree entriesLinus Torvalds2005-12-01
| * Makefile: say the default target upfront.Junio C Hamano2005-12-01
| * Documentation: describe '-f' option to git-fetch.Junio C Hamano2005-12-01
| * Move couple of ifdefs after "include config.mk"Timo Hirvonen2005-11-30
| * Merge branch 'jc/subdir'Junio C Hamano2005-11-30
| |\
| | * hash-object.c: type-fix to squelch compiler warnings.Junio C Hamano2005-11-28
| | * define die() for scripts that use it.Junio C Hamano2005-11-28
| | * verify-tag: make it operable from a subdirectory.Junio C Hamano2005-11-28
| | * tag: make it operable from a subdirectory.Junio C Hamano2005-11-28
| | * lost-found: make it operable from a subdirectory.Junio C Hamano2005-11-28
| | * branch: make it operable from a subdirectory.Junio C Hamano2005-11-28
| | * ls-remote: define die() now we do not use git-sh-setupJunio C Hamano2005-11-28
| | * count-objects: make it operable from a subdirectory.Junio C Hamano2005-11-28
| | * Make the rest of commands work from a subdirectory.Junio C Hamano2005-11-28
| | * Make networking commands to work from a subdirectory.Junio C Hamano2005-11-28
| | * ls-tree: work from subdirectory.Junio C Hamano2005-11-28
| | * hash-object: work within subdirectory.Junio C Hamano2005-11-28
| | * checkout-index: work from subdirectory.Junio C Hamano2005-11-28
| | * fsck-objects: work from subdirectory.Junio C Hamano2005-11-28
| | * peek-remote: honor proxy config even from subdirectory.Junio C Hamano2005-11-28
| | * git-apply: work from subdirectory.Junio C Hamano2005-11-28
| | * working from subdirectory: preparationJunio C Hamano2005-11-28
| | |
| | \
| | \
| | \
| | \
| | \
| *-----. \ Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect' and 'lt/merge'Junio C Hamano2005-11-30
| |\ \ \ \ \
| | | | | * | Tutorial: adjust merge example to recursive strategy.Junio C Hamano2005-11-30
| | | | | * | merge-recursive: match the unmerged index entry behaviour with merge-resolveJunio C Hamano2005-11-30
| | | | | * | diff-files: show diffs with stage0 and unmerged stage at the same time.Junio C Hamano2005-11-30
| | | | | * | merge-one-file: leave unmerged index entries upon automerge failure.Linus Torvalds2005-11-30
| | | | | * | diff-files: -1/-2/-3 to diff against unmerged stage.Linus Torvalds2005-11-30
| | | | * | | bisect: quote pathnames for eval safety.Junio C Hamano2005-11-28
| | | | * | | bisect: limit the searchspace by pathspecsLinus Torvalds2005-11-28
| | | | | |/ | | | | |/|