summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2005-12-03GIT 0.99.9l aka 1.0rc4v1.0rc4v0.99.9lJunio C Hamano90-740/+1498
2005-12-03[PATCH] daemon.c and path.enter_repo(): revamp path validation.Junio C Hamano2-58/+159
2005-12-03A few more options for git-cat-fileH. Peter Anvin2-17/+41
2005-12-03Add compat/setenv.c, use in git.c.Jason Riedy3-9/+53
2005-12-03New test case: Criss-cross mergeFredrik Kuivinen1-0/+92
2005-12-03New test case: merge with directory/file conflictsFredrik Kuivinen1-0/+25
2005-12-03test-lib.sh: Add new function, test_expect_codeFredrik Kuivinen1-0/+13
2005-12-03git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen1-1/+2
2005-12-02documentation: git-tagNo name1-1/+21
2005-12-02documentation: git-bisect (help HTML break man)Junio C Hamano1-7/+7
2005-12-02documentation: clarify read-tree --resetNo name1-4/+6
2005-12-02git-merge documentation: conflicting merge leaves higher stages in indexJunio C Hamano1-4/+6
2005-12-02merge-one-file: make sure we do not mismerge symbolic links.Junio C Hamano1-0/+8
2005-12-02merge-one-file: make sure we create the merged file.Junio C Hamano1-1/+7
2005-12-01t3100: add ls-tree -t and -d tests.Junio C Hamano1-0/+38
2005-12-01merge-recursive: adjust git-ls-tree use for the latest.Junio C Hamano1-1/+1
2005-12-01git wrapper: more careful argument stuffingAlex Riesen1-7/+12
2005-12-01git-merge-one-file: do not worry about 'rmdir -p' not removing directory.Junio C Hamano1-1/+1
2005-12-01ls-tree: --name-onlyJunio C Hamano1-2/+11
2005-12-01ls-tree: resurrect '-d' to mean 'show trees only'Junio C Hamano1-0/+6
2005-12-01git-ls-tree: add "-t" option to always show the tree entriesLinus Torvalds1-24/+41
2005-12-01Makefile: say the default target upfront.Junio C Hamano1-0/+3
2005-12-01Documentation: describe '-f' option to git-fetch.Junio C Hamano1-0/+5
2005-11-30Move couple of ifdefs after "include config.mk"Timo Hirvonen1-16/+12
2005-11-30Merge branch 'jc/subdir'Junio C Hamano38-20/+168
2005-11-30Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect' and 'lt/merge'Junio C Hamano16-318/+213
2005-11-30Do not attempt to access literal dirname "GIT_OBJECT_DIRECTORY".Tommi Virtanen1-1/+1
2005-11-30Tutorial: adjust merge example to recursive strategy.Junio C Hamano1-8/+7
2005-11-30merge-recursive: match the unmerged index entry behaviour with merge-resolveJunio C Hamano1-2/+0
2005-11-30diff-files: show diffs with stage0 and unmerged stage at the same time.Junio C Hamano2-23/+5
2005-11-30merge-one-file: leave unmerged index entries upon automerge failure.Linus Torvalds1-5/+1
2005-11-30diff-files: -1/-2/-3 to diff against unmerged stage.Linus Torvalds2-8/+64
2005-11-29git-diff: do not turn off -p/-M with any diff options.Junio C Hamano1-2/+15
2005-11-29Merge http://www.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-54/+88
2005-11-29[PATCH] Add tests for git-mv in subdirectoriesAlex Riesen1-0/+27
2005-11-29[PATCH] Make git-mv work in subdirectories, tooJohannes Schindelin1-9/+3
2005-11-30gitk: Add a preferences dialog with some basic stuffPaul Mackerras1-54/+88
2005-11-29format-patch: run diff in C localeJunio C Hamano1-1/+5
2005-11-29format-patch: do not abuse 3-dash marker line.Junio C Hamano1-1/+1
2005-11-29format-patch: remove applies-to.Junio C Hamano1-1/+0
2005-11-29applypatch: use "index" lines not "applies-to".Junio C Hamano1-13/+24
2005-11-29applymbox: typofix to enable -m option.Junio C Hamano1-1/+1
2005-11-29SVN import: Use one log callMatthias Urlichs2-29/+21
2005-11-29Fix typos and minor format issues.jdl@freescale.com1-7/+7
2005-11-29http-push cleanupNick Hengeveld1-2/+3
2005-11-28git-clone --shared should imply --localPavel Roskin1-1/+1
2005-11-28hash-object.c: type-fix to squelch compiler warnings.Junio C Hamano1-2/+2
2005-11-28define die() for scripts that use it.Junio C Hamano6-0/+30
2005-11-28verify-tag: make it operable from a subdirectory.Junio C Hamano1-4/+8
2005-11-28tag: make it operable from a subdirectory.Junio C Hamano1-1/+1