Junio C Hamano committed almost 21 years ago
Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect' and 'lt/merge'
Junio C Hamano committed almost 21 years ago
Do not attempt to access literal dirname "GIT_OBJECT_DIRECTORY".
Tommi Virtanen committed almost 21 years ago
Tutorial: adjust merge example to recursive strategy.
Junio C Hamano committed almost 21 years ago
merge-recursive: match the unmerged index entry behaviour with merge-resolve
Junio C Hamano committed almost 21 years ago
diff-files: show diffs with stage0 and unmerged stage at the same time.
Junio C Hamano committed almost 21 years ago
merge-one-file: leave unmerged index entries upon automerge failure.
Linus Torvalds committed almost 21 years ago
diff-files: -1/-2/-3 to diff against unmerged stage.
Linus Torvalds committed almost 21 years ago
git-diff: do not turn off -p/-M with any diff options.
Junio C Hamano committed almost 21 years ago
Merge http://www.kernel.org/pub/scm/gitk/gitk
Junio C Hamano committed almost 21 years ago
[PATCH] Add tests for git-mv in subdirectories
Alex Riesen committed almost 21 years ago
[PATCH] Make git-mv work in subdirectories, too
Johannes Schindelin committed almost 21 years ago
gitk: Add a preferences dialog with some basic stuff
Paul Mackerras committed almost 21 years ago
format-patch: run diff in C locale
Junio C Hamano committed almost 21 years ago
format-patch: do not abuse 3-dash marker line.
Junio C Hamano committed almost 21 years ago
format-patch: remove applies-to.
Junio C Hamano committed almost 21 years ago
applypatch: use "index" lines not "applies-to".
Junio C Hamano committed almost 21 years ago
applymbox: typofix to enable -m option.
Junio C Hamano committed almost 21 years ago
Matthias Urlichs committed almost 21 years ago
Fix typos and minor format issues.
jdl@freescale.com committed almost 21 years ago