| 2010-04-18 | Documentation: Describe other situations where -z affects... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2009-05-25 | Change xdl_merge to generate output even for null merges Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2009-05-25 | t6023: merge-file fails to output anything for a degenerate... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2009-01-31 | mergetool: fix running mergetool in sub-directories Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2009-01-31 | mergetool: Add a test for running mergetool in a sub... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2009-01-27 | mergetool: respect autocrlf by using checkout-index Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-12-13 | mergetool: Don't keep temporary merge files unless... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-12-13 | mergetool: Add prompt to continue after failing to... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-11-15 | Add -y/--no-prompt option to mergetool Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-11-15 | Fix some tab/space inconsistencies in git-mergetool.sh Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-10-26 | git-archive: work in bare repos Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-09-19 | Make git archive respect core.autocrlf when creating... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-09-19 | Add new test to demonstrate git archive core.autocrlf... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-03-08 | merge-tool documentation: describe custom command usage Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-03-08 | git-mergetool documentaiton: show toolnames in typewriter... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-03-05 | Add a very basic test script for git mergetool Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-03-05 | Teach git mergetool to use custom commands defined... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-03-05 | Changed an internal variable of mergetool to support... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-03-05 | Tidy up git mergetool's backup file behaviour Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2008-01-11 | gitk: Fix the Makefile to cope with systems lacking... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2007-12-21 | Remove old generated files from .gitignore. Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2007-12-19 | Fix git-instaweb breakage on MacOS X due to the limited... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |
| 2007-12-12 | Fix clone not to ignore depth when performing a local... Signed-off-by: Charles Bailey <charles@hashpling.org> |
diff | tree |