summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2005-12-04struct tree: remove unused field "parent"Libravatar Junio C Hamano2-2/+0
2005-12-04Documentation: rebase does not use cherry-pick anymore.Libravatar Junio C Hamano1-1/+1
2005-12-04Document the --(no-)edit switch of git-revert and git-cherry-pickLibravatar Petr Baudis3-4/+17
2005-12-04show-branch: allow glob pattern to name branches to show.Libravatar Junio C Hamano2-15/+84
2005-12-04Update the git-ls-tree documentationLibravatar Petr Baudis1-14/+29
2005-12-04git.c: two fixes, gitsetenv type and off-by-one error.Libravatar Junio C Hamano1-2/+1
2005-12-04compat/setenv: do not free what we fed putenv(3).Libravatar Junio C Hamano1-2/+6
2005-12-04Warn when send-pack does nothingLibravatar Daniel Barkalow1-0/+6
2005-12-03[PATCH] daemon.c and path.enter_repo(): revamp path validation.Libravatar Junio C Hamano2-58/+159
2005-12-03A few more options for git-cat-fileLibravatar H. Peter Anvin2-18/+42
2005-12-03Add compat/setenv.c, use in git.c.Libravatar Jason Riedy3-9/+53
2005-12-03New test case: Criss-cross mergeLibravatar Fredrik Kuivinen1-0/+92
2005-12-03New test case: merge with directory/file conflictsLibravatar Fredrik Kuivinen1-0/+25
2005-12-03test-lib.sh: Add new function, test_expect_codeLibravatar Fredrik Kuivinen1-0/+13
2005-12-03git-merge: Exit with code 2 if no strategy was able to handle the merge.Libravatar Fredrik Kuivinen1-1/+2
2005-12-02documentation: git-tagLibravatar No name1-1/+21
2005-12-02documentation: git-bisect (help HTML break man)Libravatar Junio C Hamano1-7/+7
2005-12-02documentation: clarify read-tree --resetLibravatar No name1-4/+6
2005-12-02git-merge documentation: conflicting merge leaves higher stages in indexLibravatar Junio C Hamano1-4/+6
2005-12-02merge-one-file: make sure we do not mismerge symbolic links.Libravatar Junio C Hamano1-0/+8
2005-12-02merge-one-file: make sure we create the merged file.Libravatar Junio C Hamano1-1/+7
2005-12-01t3100: add ls-tree -t and -d tests.Libravatar Junio C Hamano1-0/+38
2005-12-01merge-recursive: adjust git-ls-tree use for the latest.Libravatar Junio C Hamano1-1/+1
2005-12-01git wrapper: more careful argument stuffingLibravatar Alex Riesen1-7/+12
2005-12-01git-merge-one-file: do not worry about 'rmdir -p' not removing directory.Libravatar Junio C Hamano1-1/+1
2005-12-01ls-tree: --name-onlyLibravatar Junio C Hamano1-2/+11
2005-12-01ls-tree: resurrect '-d' to mean 'show trees only'Libravatar Junio C Hamano1-0/+6
2005-12-01git-ls-tree: add "-t" option to always show the tree entriesLibravatar Linus Torvalds1-24/+41
2005-12-01Makefile: say the default target upfront.Libravatar Junio C Hamano1-0/+3
2005-12-01Documentation: describe '-f' option to git-fetch.Libravatar Junio C Hamano1-0/+5
2005-11-30Move couple of ifdefs after "include config.mk"Libravatar Timo Hirvonen1-16/+12
2005-11-30Merge branch 'jc/subdir'Libravatar Junio C Hamano38-20/+168
2005-11-30Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect' and 'lt/merge'Libravatar Junio C Hamano16-320/+215
2005-11-30Do not attempt to access literal dirname "GIT_OBJECT_DIRECTORY".Libravatar Tommi Virtanen1-1/+1
2005-11-30Tutorial: adjust merge example to recursive strategy.Libravatar Junio C Hamano1-8/+7
2005-11-30merge-recursive: match the unmerged index entry behaviour with merge-resolveLibravatar Junio C Hamano1-2/+0
2005-11-30diff-files: show diffs with stage0 and unmerged stage at the same time.Libravatar Junio C Hamano2-23/+5
2005-11-30merge-one-file: leave unmerged index entries upon automerge failure.Libravatar Linus Torvalds1-5/+1
2005-11-30diff-files: -1/-2/-3 to diff against unmerged stage.Libravatar Linus Torvalds2-8/+64
2005-11-29git-diff: do not turn off -p/-M with any diff options.Libravatar Junio C Hamano1-2/+15
2005-11-29Merge http://www.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-54/+88
2005-11-29[PATCH] Add tests for git-mv in subdirectoriesLibravatar Alex Riesen1-0/+27
2005-11-29[PATCH] Make git-mv work in subdirectories, tooLibravatar Johannes Schindelin1-9/+3
2005-11-30gitk: Add a preferences dialog with some basic stuffLibravatar Paul Mackerras1-54/+88
2005-11-29format-patch: run diff in C localeLibravatar Junio C Hamano1-1/+5
2005-11-29format-patch: do not abuse 3-dash marker line.Libravatar Junio C Hamano1-1/+1
2005-11-29format-patch: remove applies-to.Libravatar Junio C Hamano1-1/+0
2005-11-29applypatch: use "index" lines not "applies-to".Libravatar Junio C Hamano1-13/+24
2005-11-29applymbox: typofix to enable -m option.Libravatar Junio C Hamano1-1/+1
2005-11-29SVN import: Use one log callLibravatar Matthias Urlichs2-29/+21