summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2005-12-05Documentation: git-diff asciidoc table workaround.Junio C Hamano
2005-12-05Documentation: git-mv manpage workaround.Junio C Hamano
2005-12-05Documentation: talk about pathspec in bisect.Junio C Hamano
2005-12-05server-info: throw away T computation as well.Junio C Hamano
2005-12-05server-info: stop sorting packs by latest date.Junio C Hamano
2005-12-05server-info.c: drop unused D lines.Junio C Hamano
2005-12-05sha1_file.c: make sure packs in an alternate odb is named properly.Junio C Hamano
2005-12-05git.c: remove excess output for debugging when command is too long.Junio C Hamano
2005-12-05struct tree: remove unused field "parent"Junio C Hamano
2005-12-05Documentation: rebase does not use cherry-pick anymore.Junio C Hamano
2005-12-05Document the --(no-)edit switch of git-revert and git-cherry-pickPetr Baudis
2005-12-05show-branch: allow glob pattern to name branches to show.Junio C Hamano
2005-12-05Update the git-ls-tree documentationPetr Baudis
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