summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2005-12-04git.c: two fixes, gitsetenv type and off-by-one error.Junio C Hamano
2005-12-04compat/setenv: do not free what we fed putenv(3).Junio C Hamano
2005-12-04Warn when send-pack does nothingDaniel Barkalow
2005-12-04[PATCH] daemon.c and path.enter_repo(): revamp path validation.Junio C Hamano
2005-12-04A few more options for git-cat-fileH. Peter Anvin
2005-12-04Add compat/setenv.c, use in git.c.Jason Riedy
2005-12-03New test case: Criss-cross mergeFredrik Kuivinen
2005-12-03New test case: merge with directory/file conflictsFredrik Kuivinen
2005-12-03test-lib.sh: Add new function, test_expect_codeFredrik Kuivinen
2005-12-03git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen
2005-12-02documentation: git-tagNo name
2005-12-02documentation: git-bisect (help HTML break man)Junio C Hamano
2005-12-02documentation: clarify read-tree --resetNo name
2005-12-02git-merge documentation: conflicting merge leaves higher stages in indexJunio C Hamano
2005-12-02merge-one-file: make sure we do not mismerge symbolic links.Junio C Hamano
2005-12-02merge-one-file: make sure we create the merged file.Junio C Hamano
2005-12-02t3100: add ls-tree -t and -d tests.Junio C Hamano
2005-12-02merge-recursive: adjust git-ls-tree use for the latest.Junio C Hamano
2005-12-02git wrapper: more careful argument stuffingAlex Riesen
2005-12-02git-merge-one-file: do not worry about 'rmdir -p' not removing directory.Junio C Hamano
2005-12-01ls-tree: --name-onlyJunio C Hamano
2005-12-01ls-tree: resurrect '-d' to mean 'show trees only'Junio C Hamano
2005-12-01git-ls-tree: add "-t" option to always show the tree entriesLinus Torvalds
2005-12-01Makefile: say the default target upfront.Junio C Hamano
2005-12-01Documentation: describe '-f' option to git-fetch.Junio C Hamano
2005-12-01Move couple of ifdefs after "include config.mk"Timo Hirvonen
2005-11-30Merge branch 'jc/subdir'Junio C Hamano
2005-11-30Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect' and 'lt/merge'Junio C Hamano
2005-11-30Do not attempt to access literal dirname "GIT_OBJECT_DIRECTORY".Tommi Virtanen
2005-11-30Tutorial: adjust merge example to recursive strategy.Junio C Hamano
2005-11-30merge-recursive: match the unmerged index entry behaviour with merge-resolveJunio C Hamano
2005-11-30diff-files: show diffs with stage0 and unmerged stage at the same time.Junio C Hamano
2005-11-30merge-one-file: leave unmerged index entries upon automerge failure.Linus Torvalds
2005-11-30diff-files: -1/-2/-3 to diff against unmerged stage.Linus Torvalds
2005-11-30git-diff: do not turn off -p/-M with any diff options.Junio C Hamano
2005-11-29Merge http://www.kernel.org/pub/scm/gitk/gitkJunio C Hamano
2005-11-29[PATCH] Add tests for git-mv in subdirectoriesAlex Riesen
2005-11-29[PATCH] Make git-mv work in subdirectories, tooJohannes Schindelin
2005-11-29gitk: Add a preferences dialog with some basic stuffPaul Mackerras
2005-11-29format-patch: run diff in C localeJunio C Hamano
2005-11-29format-patch: do not abuse 3-dash marker line.Junio C Hamano
2005-11-29format-patch: remove applies-to.Junio C Hamano
2005-11-29applypatch: use "index" lines not "applies-to".Junio C Hamano
2005-11-29applymbox: typofix to enable -m option.Junio C Hamano
2005-11-29SVN import: Use one log callMatthias Urlichs
2005-11-29Fix typos and minor format issues.jdl@freescale.com
2005-11-29http-push cleanupNick Hengeveld
2005-11-29git-clone --shared should imply --localPavel Roskin
2005-11-29hash-object.c: type-fix to squelch compiler warnings.Junio C Hamano
2005-11-29define die() for scripts that use it.Junio C Hamano