Commits

Breadcrumbs

History for

onmaster

User selector

All users

All time

Commit History

Commits on Feb 22, 2021

• difftool.c: learn a new way start at specified file

  Show description for 1c88102
  

  adlternative

  authored and

  gitster

  committed
  1c88102

  Copy full SHA for 1c88102

Commits on May 13, 2019

• difftool: fallback on merge.guitool

  Show description for 6c22d71
  

  Denton-L

  authored and

  gitster

  committed
  6c22d71

  Copy full SHA for 6c22d71

Commits on Feb 8, 2017

• Document the --no-gui option in difftool

  Show description for 56c2da5
  

  Denton-L

  authored and

  gitster

  committed
  56c2da5

  Copy full SHA for 56c2da5

Commits on Jun 28, 2016

• doc: typeset long command-line options as literal

  Show description for bcf9626
  

  moy

  authored and

  gitster

  committed
  bcf9626

  Copy full SHA for bcf9626

Commits on Oct 28, 2014

• difftool: add support for --trust-exit-code

  Show description for 2b52123
  

  davvid

  authored and

  gitster

  committed
  2b52123

  Copy full SHA for 2b52123

Commits on May 17, 2013

• documentation: trivial style cleanups

  Show description for 0460ed2
  

  felipec

  authored and

  gitster

  committed
  0460ed2

  Copy full SHA for 0460ed2

Commits on Mar 14, 2013

• difftool --dir-diff: symlink all files matching the working tree

  Show description for 02c5631
  

  johnkeeping

  authored and

  gitster

  committed
  02c5631

  Copy full SHA for 02c5631

• git-difftool(1): fix formatting of --symlink description

  Show description for 8aa10d4
  

  johnkeeping

  authored and

  gitster

  committed
  8aa10d4

  Copy full SHA for 8aa10d4

Commits on Feb 1, 2013

• Documentation: the name of the system is 'Git', not 'git'

  Show description for 2de9b71
  

  tacker66

  authored and

  gitster

  committed
  2de9b71

  Copy full SHA for 2de9b71

Commits on Aug 10, 2012

• mergetool,difftool: Document --tool-help consistently

  Show description for 7a30747
  

  davvid

  authored and

  gitster

  committed
  7a30747

  Copy full SHA for 7a30747

Commits on Jul 23, 2012

• difftool: Use symlinks when diffing against the worktree

  Show description for 1f22934
  

  davvid

  authored and

  gitster

  committed
  1f22934

  Copy full SHA for 1f22934

Commits on Apr 23, 2012

• difftool: print list of valid tools with '--tool-help'

  Show description for bf73fc2
  

  thenigan

  authored and

  gitster

  committed
  bf73fc2

  Copy full SHA for bf73fc2

• difftool: teach difftool to handle directory diffs

  Show description for 7e0abce
  

  thenigan

  authored and

  gitster

  committed
  7e0abce

  Copy full SHA for 7e0abce

Commits on Mar 15, 2012

• Documentation/difftool: add deltawalker to list of valid diff tools

  Show description for 79e0fe6
  

  thenigan

  authored and

  gitster

  committed
  79e0fe6

  Copy full SHA for 79e0fe6

Commits on Nov 21, 2011

• documentation fix: git difftool uses diff tools, not merge tools.

  Show description for 1e501a7
  

  th-h

  authored and

  gitster

  committed
  1e501a7

  Copy full SHA for 1e501a7

Commits on Jul 6, 2011

• Documentation: use [verse] for SYNOPSIS sections

  Show description for 7791a1d
  

  Martin von Zweigbergk

  authored and

  gitster

  committed
  7791a1d

  Copy full SHA for 7791a1d

Commits on Mar 20, 2011

• Merge branch 'ss/mergetool--lib'

  Show description for 9d59e66
  gitster

  committed
  9d59e66

  Copy full SHA for 9d59e66

Commits on Mar 11, 2011

• doc: drop author/documentation sections from most pages

  Show description for 48bb914
  peff

  committed
  48bb914

  Copy full SHA for 48bb914

Commits on Feb 28, 2011

• mergetool--lib: Add Beyond Compare 3 as a tool

  Show description for ffe6dc0
  

  sschuberth

  authored and

  gitster

  committed
  ffe6dc0

  Copy full SHA for ffe6dc0

• mergetool--lib: Sort tools alphabetically for easier lookup

  Show description for aa03f60
  

  sschuberth

  authored and

  gitster

  committed
  aa03f60

  Copy full SHA for aa03f60

Commits on Dec 17, 2010

• Merge branch 'maint'

  Show description for 38a5932
  gitster

  committed
  38a5932

  Copy full SHA for 38a5932

Commits on Dec 16, 2010

• difftool: provide basename to external tools

  Show description for 4a689af
  

  Michael J Gruber

  authored and

  gitster

  committed
  4a689af

  Copy full SHA for 4a689af

• git-difftool.txt: correct the description of $BASE and describe $MERGED

  Show description for 51bacee
  

  Michael J Gruber

  authored and

  gitster

  committed
  51bacee

  Copy full SHA for 51bacee

Commits on Nov 5, 2010

• docs: clarify git diff modes of operation

  Show description for 49bd56a
  

  peff

  authored and

  gitster

  committed
  49bd56a

  Copy full SHA for 49bd56a

• diff,difftool: Don't use the {0,2} notation in usage strings

  Show description for 9edb8a0
  

  stepnem

  authored and

  gitster

  committed
  9edb8a0

  Copy full SHA for 9edb8a0

Commits on Jan 21, 2010

• Merge remote branch 'remotes/trast-doc/for-next'

  Show description for add0951
  gitster

  committed
  add0951

  Copy full SHA for add0951

Commits on Jan 15, 2010

• difftool: Add '-x' and as an alias for '--extcmd'

  Show description for f47f1e2
  

  davvid

  authored and

  gitster

  committed
  f47f1e2

  Copy full SHA for f47f1e2

Commits on Jan 10, 2010

• Documentation: spell 'git cmd' without dash throughout

  Show description for 0b444cd
  trast

  committed
  0b444cd

  Copy full SHA for 0b444cd

• difftool: Allow specifying unconfigured commands with --extcmd

  Show description for 1c6f5b5
  

  davvid

  authored and

  gitster

  committed
  1c6f5b5

  Copy full SHA for 1c6f5b5

Commits on Jan 3, 2010

• git-difftool: Add '--gui' for selecting a GUI tool

  Show description for 4cefa49
  

  davvid

  authored and

  gitster

  committed
  4cefa49

  Copy full SHA for 4cefa49

Commits on Oct 28, 2009

• mergetool--lib: add p4merge as a pre-configured mergetool option

  Show description for c8998b4
  

  schacon

  authored and

  gitster

  committed
  c8998b4

  Copy full SHA for c8998b4

Commits on May 24, 2009

• mergetool--lib: add support for araxis merge

  Show description for b6f0621
  

  davvid

  authored and

  gitster

  committed
  b6f0621

  Copy full SHA for b6f0621

Commits on Apr 8, 2009

• difftool: add support for a difftool.prompt config variable

  Show description for a904392
  

  davvid

  authored and

  gitster

  committed
  a904392

  Copy full SHA for a904392

• difftool: move 'git-difftool' out of contrib

  Show description for afcbc8e
  

  davvid

  authored and

  gitster

  committed
  afcbc8e

  Copy full SHA for afcbc8e

Loading