1. 20 Dec, 2008 1 commit
  2. 13 Dec, 2008 2 commits
  3. 15 Nov, 2008 2 commits
  4. 19 Jun, 2008 1 commit
  5. 11 May, 2008 1 commit
  6. 05 Mar, 2008 3 commits
    • CB Bailey's avatar
      Teach git mergetool to use custom commands defined at config time · 964473a0
      CB Bailey authored
      Currently git mergetool is restricted to a set of commands defined
      in the script. You can subvert the mergetool.<tool>.path to force
      git mergetool to use a different command, but if you have a command
      whose invocation syntax does not match one of the current tools then
      you would have to write a wrapper script for it.
      
      This patch adds two git config variable patterns which allow a more
      flexible choice of merge tool.
      
      If you run git mergetool with -t/--tool or the merge.tool config
      variable set to an unrecognized tool then git mergetool will query the
      mergetool.<tool>.cmd config variable. If this variable exists, then git
      mergetool will treat the specified tool as a custom command and will use
      a shell eval to run the command with the documented shell variables set.
      
      mergetool.<tool>.trustExitCode can be used to indicate that the exit
      code of the custom command can be used to determine the success of the
      merge.
      Signed-off-by: CB Bailey's avatarCharles Bailey <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      964473a0
    • CB Bailey's avatar
      Changed an internal variable of mergetool to support custom commands · b3ea27e4
      CB Bailey authored
      The variable $path changes to $MERGED so that it is more consistent
      with $BASE, $LOCAL and $REMOTE for future custom command lines.
      Signed-off-by: CB Bailey's avatarCharles Bailey <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      b3ea27e4
    • CB Bailey's avatar
      Tidy up git mergetool's backup file behaviour · 44c36d1c
      CB Bailey authored
      Currently a backup pre-merge file with conflict markers is sometimes
      kept with a .orig extenstion and sometimes removed depending on the
      particular merge tool used.
      
      This patch makes the handling consistent across all merge tools and
      configurable via a new mergetool.keepBackup config variable
      Signed-off-by: CB Bailey's avatarCharles Bailey <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      44c36d1c
  7. 08 Jan, 2008 1 commit
  8. 06 Dec, 2007 1 commit
  9. 06 Nov, 2007 1 commit
  10. 18 Oct, 2007 3 commits
  11. 29 Sep, 2007 3 commits
  12. 23 Sep, 2007 1 commit
    • David Kastrup's avatar
      Supplant the "while case ... break ;; esac" idiom · 822f7c73
      David Kastrup authored
      A lot of shell scripts contained stuff starting with
      
      	while case "$#" in 0) break ;; esac
      
      and similar.  I consider breaking out of the condition instead of the
      body od the loop ugly, and the implied "true" value of the
      non-matching case is not really obvious to humans at first glance.  It
      happens not to be obvious to some BSD shells, either, but that's
      because they are not POSIX-compliant.  In most cases, this has been
      replaced by a straight condition using "test".  "case" has the
      advantage of being faster than "test" on vintage shells where "test"
      is not a builtin.  Since none of them is likely to run the git
      scripts, anyway, the added readability should be worth the change.
      
      A few loops have had their termination condition expressed
      differently.
      Signed-off-by: default avatarDavid Kastrup <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      822f7c73
  13. 03 Jul, 2007 1 commit
  14. 10 Jun, 2007 2 commits
  15. 06 Jun, 2007 1 commit
  16. 30 Mar, 2007 1 commit
  17. 29 Mar, 2007 9 commits
  18. 19 Mar, 2007 2 commits
  19. 14 Mar, 2007 1 commit