tokkee.org

Code

projects / git.git / search

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

2007-03-30	Theodore Ts'o	mergetool: Clean up description of files and prompts... Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-29	Theodore Ts'o	mergetool: Make git-rm quiet when resolving a deleted... Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-29	Theodore Ts'o	mergetool: Add support for Apple Mac OS X's opendiff... Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-29	Theodore Ts'o	mergetool: Fix abort command when resolving symlinks... Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-29	Theodore Ts'o	mergetool: Remove spurious error message if merge.tool... Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-29	Theodore Ts'o	mergetool: factor out common code Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-29	Theodore Ts'o	mergetool: portability fix: don't use reserved word... Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-29	Theodore Ts'o	mergetool: portability fix: don't assume true is in... Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-29	Theodore Ts'o	mergetool: Don't error out in the merge case where... Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-29	Theodore Ts'o	mergetool: Replace use of "echo -n" with printf(1)... Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-29	Theodore Ts'o	Fix minor formatting issue in man page for git-mergetool Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-19	Theodore Ts'o	mergetool: print an appropriate warning if merge.tool... Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-19	James Bowes	mergetool: Add support for vimdiff. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree
2007-03-14	Theodore Ts'o	Add git-mergetool to run an appropriate merge conflict... Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>	commit \| commitdiff \| tree

Git - the stupid content tracker