?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Documentation: Describe other situations where -z affects git diff
2010-04-18 Charles BaileyDocumentation: Describe other situations where -z affects...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2009-05-25 Charles BaileyChange xdl_merge to generate output even for null merges
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2009-05-25 Charles Baileyt6023: merge-file fails to output anything for a degenerate...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2009-01-31 Charles Baileymergetool: fix running mergetool in sub-directories
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2009-01-31 Charles Baileymergetool: Add a test for running mergetool in a sub...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2009-01-27 Charles Baileymergetool: respect autocrlf by using checkout-index
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-12-13 Charles Baileymergetool: Don't keep temporary merge files unless...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-12-13 Charles Baileymergetool: Add prompt to continue after failing to...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-11-15 Charles BaileyAdd -y/--no-prompt option to mergetool
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-11-15 Charles BaileyFix some tab/space inconsistencies in git-mergetool.sh
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-10-26 Charles Baileygit-archive: work in bare repos
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-09-19 Charles BaileyMake git archive respect core.autocrlf when creating...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-09-19 Charles BaileyAdd new test to demonstrate git archive core.autocrlf...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-03-08 Charles Baileymerge-tool documentation: describe custom command usage
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-03-08 Charles Baileygit-mergetool documentaiton: show toolnames in typewriter...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-03-05 Charles BaileyAdd a very basic test script for git mergetool
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-03-05 Charles BaileyTeach git mergetool to use custom commands defined...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-03-05 Charles BaileyChanged an internal variable of mergetool to support...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-03-05 Charles BaileyTidy up git mergetool's backup file behaviour
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2008-01-11 Charles Baileygitk: Fix the Makefile to cope with systems lacking...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2007-12-21 Charles BaileyRemove old generated files from .gitignore.
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2007-12-19 Charles BaileyFix git-instaweb breakage on MacOS X due to the limited...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
2007-12-12 Charles BaileyFix clone not to ignore depth when performing a local...
Signed-off-by: Charles Bailey <charles@hashpling.org>
 commit | commitdiff | tree
knittl's private git fork