Commits

Branch selector

 master

User selector

davvid

Datepicker

All time

Commit History

Commits on Apr 4, 2019

• contrib/completion: add smerge to the mergetool completion candidates

  Show description for f57b2ae
  

  davvid

  authored and

  gitster

  committed
  f57b2ae

• mergetools: add support for smerge (Sublime Merge)

  Show description for eb12adc
  

  davvid

  authored and

  gitster

  committed
  eb12adc

Commits on Jun 19, 2017

• mergetools/meld: improve compatibiilty with Meld on macOS X

  Show description for 0af85f8
  

  davvid

  authored and

  gitster

  committed
  0af85f8

Commits on Mar 15, 2017

• difftool: handle modified symlinks in dir-diff mode

  Show description for 18ec800
  

  davvid

  authored and

  gitster

  committed
  18ec800

• t7800: cleanup cruft left behind by tests

  Show description for 98fde5e
  

  davvid

  authored and

  gitster

  committed
  98fde5e

• t7800: remove whitespace before redirect

  Show description for 8d8061d
  

  davvid

  authored and

  gitster

  committed
  8d8061d

Commits on Feb 8, 2017

• t7800: replace "wc -l" with test_line_count

  Show description for 1ce515f
  

  davvid

  authored and

  gitster

  committed
  1ce515f

• t7800: simplify basic usage test

  Show description for e66adca
  

  davvid

  authored and

  gitster

  committed
  e66adca

Commits on Feb 6, 2017

• difftool: fix bug when printing usage

  Show description for d81345c
  

  davvid

  authored and

  gitster

  committed
  d81345c

Commits on Jan 18, 2017

• gitk: Remove translated message from comments

  Show description for 7f03c6e
  

  davvid

  authored and

  paulusmack

  committed
  7f03c6e

Commits on Dec 12, 2016

• mergetools: fix xxdiff hotkeys

  Show description for 6cf5f6c
  

  davvid

  authored and

  gitster

  committed
  6cf5f6c

• difftool: rename variables for consistency

  Show description for ce69269
  

  davvid

  authored and

  gitster

  committed
  ce69269

• difftool: chdir as early as possible

  Show description for f242a03
  

  davvid

  authored and

  gitster

  committed
  f242a03

• difftool: sanitize $workdir as early as possible

  Show description for e6e3e2a
  

  davvid

  authored and

  gitster

  committed
  e6e3e2a

• difftool: fix dir-diff index creation when in a subdirectory

  Show description for 86defcb
  

  davvid

  authored and

  gitster

  committed
  86defcb

Commits on Dec 8, 2016

• difftool: fix dir-diff index creation when in a subdirectory

  Show description for 853e10c
  

  davvid

  authored and

  gitster

  committed
  853e10c

Commits on Nov 29, 2016

• mergetools/vimdiff: trust Vim's exit code

  Show description for 2967284
  

  davvid

  authored and

  gitster

  committed
  2967284

• mergetool: honor mergetool.$tool.trustExitCode for built-in tools

  Show description for 7c10605
  

  davvid

  authored and

  gitster

  committed
  7c10605

Commits on Oct 11, 2016

• mergetool: honor -O<orderfile>

  Show description for 654311b
  

  davvid

  authored and

  gitster

  committed
  654311b

• mergetool: honor diff.orderFile

  Show description for 57937f7
  

  davvid

  authored and

  gitster

  committed
  57937f7

• mergetool: move main program flow into a main() function

  Show description for 08221e3
  

  davvid

  authored and

  gitster

  committed
  08221e3

• mergetool: add copyright

  Show description for 8827b3a
  

  davvid

  authored and

  gitster

  committed
  8827b3a

Commits on Jul 28, 2016

• difftool: use Git::* functions instead of passing around state

  Show description for 32b8c58
  

  davvid

  authored and

  gitster

  committed
  32b8c58

• difftool: avoid $GIT_DIR and $GIT_WORK_TREE

  Show description for 98f917e
  

  davvid

  authored and

  gitster

  committed
  98f917e

• subtree: adjust function definitions to match CodingGuidelines

  Show description for d7fd792
  

  davvid

  authored and

  gitster

  committed
  d7fd792

• subtree: adjust style to match CodingGuidelines

  Show description for 6ae6a23
  

  davvid

  authored and

  gitster

  committed
  6ae6a23

Commits on Jul 26, 2016

• subtree: fix "git subtree split --rejoin"

  Show description for 0f12c7d
  

  davvid

  authored and

  gitster

  committed
  0f12c7d

• t7900-subtree.sh: fix quoting and broken && chains

  Show description for fbd3199
  

  davvid

  authored and

  gitster

  committed
  fbd3199

Commits on May 16, 2016

• difftool: handle unmerged files in dir-diff mode

  Show description for 366f9ce
  

  davvid

  authored and

  gitster

  committed
  366f9ce

• difftool: initialize variables for readability

  Show description for 951b551
  

  davvid

  authored and

  gitster

  committed
  951b551

Commits on Mar 10, 2016

• mergetool: honor tempfile configuration when resolving delete conflicts

  Show description for a298604
  

  davvid

  authored and

  gitster

  committed
  a298604

• mergetool: support delete/delete conflicts

  Show description for faaab8d
  

  davvid

  authored and

  gitster

  committed
  faaab8d

Commits on Oct 29, 2015

• difftool: ignore symbolic links in use_wt_file

  Show description for cfe2d4b
  

  davvid

  authored and

  gitster

  committed
  cfe2d4b

Commits on Jul 23, 2015

• contrib/subtree: ignore log.date configuration

  Show description for e7aac44
  

  davvid

  authored and

  gitster

  committed
  e7aac44

Commits on May 20, 2015

• mergetools: add winmerge as a builtin tool

  Show description for 3e4f237
  

  davvid

  authored and

  gitster

  committed
  3e4f237

Pagination

PreviousNext