Commits

Branch selector

 master

User selector

davvid

Datepicker

All time

Commit History

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

• mergetool--lib: set IFS for difftool and mergetool

  Show description for 719518f
  

  davvid

  authored and

  gitster

  committed
  719518f

Commits on Nov 21, 2014

• mergetools: stop setting $status in merge_cmd()

  Show description for 1e86d5b
  

  davvid

  authored and

  gitster

  committed
  1e86d5b

• mergetool: simplify conditionals

  Show description for 98a2602
  

  davvid

  authored and

  gitster

  committed
  98a2602

• difftool--helper: add explicit exit statement

  Show description for c41d3fe
  

  davvid

  authored and

  gitster

  committed
  c41d3fe

• mergetool--lib: remove use of $status global

  Show description for 1b6a534
  

  davvid

  authored and

  gitster

  committed
  1b6a534

Commits on Nov 14, 2014

• difftool: honor --trust-exit-code for builtin tools

  Show description for 99474b6
  

  davvid

  authored and

  gitster

  committed
  99474b6

Commits on Oct 28, 2014

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

  Show description for 2b52123
  

  davvid

  authored and

  gitster

  committed
  2b52123

Commits on Oct 16, 2014

• t7610-mergetool: add test cases for mergetool.writeToTemp

  Show description for 688684e
  

  davvid

  authored and

  gitster

  committed
  688684e

• mergetool: add an option for writing to a temporary directory

  Show description for 8f0cb41
  

  davvid

  authored and

  gitster

  committed
  8f0cb41

• mergetool: use more conservative temporary filenames

  Show description for eab335c
  

  davvid

  authored and

  gitster

  committed
  eab335c

• test-lib-functions: adjust style to match CodingGuidelines

  Show description for 9e8f8de
  

  davvid

  authored and

  gitster

  committed
  9e8f8de

• t7610-mergetool: use test_config to isolate tests

  Show description for d7d300e
  

  davvid

  authored and

  gitster

  committed
  d7d300e

• mergetools/meld: make usage of --output configurable and more robust

  Show description for b12d045
  

  davvid

  authored and

  gitster

  committed
  b12d045

Commits on Oct 15, 2014

• git-sh-setup: move GIT_DIR initialization into a function

  Show description for 1c7e2d2
  

  davvid

  authored and

  gitster

  committed
  1c7e2d2

• mergetool: use more conservative temporary filenames

  Show description for 9c66cd3
  

  davvid

  authored and

  gitster

  committed
  9c66cd3

• test-lib-functions: adjust style to match CodingGuidelines

  Show description for 76ee96a
  

  davvid

  authored and

  gitster

  committed
  76ee96a

• t7610-mergetool: prefer test_config over git config

  Show description for f9e4308
  

  davvid

  authored and

  gitster

  committed
  f9e4308

• t7610-mergetool: add missing && and remove commented-out code

  Show description for 4756c05
  

  davvid

  authored and

  gitster

  committed
  4756c05

• t7610-mergetool: use tabs instead of a mix of tabs and spaces

  Show description for 7457861
  

  davvid

  authored and

  gitster

  committed
  7457861

Commits on Oct 7, 2014

• completion: add --show-signature for log and show

  Show description for 2ca0b19
  

  davvid

  authored and

  gitster

  committed
  2ca0b19

Commits on Sep 19, 2014

• stash: prefer --quiet over shell redirection of the standard error stream

  Show description for 1956dfa
  

  davvid

  authored and

  gitster

  committed
  1956dfa

• refs: make rev-parse --quiet actually quiet

  Show description for c41a87d
  

  davvid

  authored and

  gitster

  committed
  c41a87d

Commits on Sep 16, 2014

• t1503: use test_must_be_empty

  Show description for 2892dfe
  

  davvid

  authored and

  gitster

  committed
  2892dfe

Commits on Sep 15, 2014

• Documentation: a note about stdout for git rev-parse --verify --quiet

  Show description for 56625df
  

  davvid

  authored and

  gitster

  committed
  56625df

• cleanups: ensure that git-compat-util.h is included first

  Show description for 1c4b660
  

  davvid

  authored and

  gitster

  committed
  1c4b660

Commits on Sep 2, 2014

• stylefix: asterisks stick to the variable, not the type

  Show description for 24d36f1
  

  davvid

  authored and

  gitster

  committed
  24d36f1

Commits on Jun 27, 2014

• gitk: Catch mkdtemp errors

  Show description for ac54a4b
  

  davvid

  authored and

  paulusmack

  committed
  ac54a4b

Commits on Jun 15, 2014

• gitk: Use mktemp -d to avoid predictable temporary directories

  Show description for 105b5d3
  

  davvid

  authored and

  paulusmack

  committed
  105b5d3

Pagination

Previous

Next