Commits

Branch selector

 master

User selector

hashpling

Datepicker

All time

Commit History

Commits on Jun 22, 2015

• contrib/subtree: small tidy-up to test

  Show description for 4a9d42e
  

  hashpling

  authored and

  gitster

  committed
  4a9d42e

  Copy full SHA for 4a9d42e

• contrib/subtree: fix broken &&-chains and revealed test error

  Show description for cccf7d7
  

  hashpling

  authored and

  gitster

  committed
  cccf7d7

  Copy full SHA for cccf7d7

• contrib/subtree: use tabs consitently for indentation in tests

  Show description for 0141ef0
  

  hashpling

  authored and

  gitster

  committed
  0141ef0

  Copy full SHA for 0141ef0

Commits on Jul 21, 2014

• Fix contrib/subtree Makefile to patch #! line

  Show description for f6f91f9
  

  hashpling

  authored and

  gitster

  committed
  f6f91f9

  Copy full SHA for f6f91f9

Commits on Aug 20, 2010

• mergetool: Remove explicit references to /dev/tty

  Show description for af31471
  

  hashpling

  authored and

  gitster

  committed
  af31471

  Copy full SHA for af31471

Commits on Apr 20, 2010

• stash tests: stash can lose data in a file removed from the index

  Show description for 2ba2fe2
  

  hashpling

  authored and

  gitster

  committed
  2ba2fe2

  Copy full SHA for 2ba2fe2

Commits on Apr 18, 2010

• stash: Don't overwrite files that have gone from the index

  Show description for 7aa5d43
  

  hashpling

  authored and

  gitster

  committed
  7aa5d43

  Copy full SHA for 7aa5d43

• Documentation: Describe other situations where -z affects git diff

  Show description for 03aa87e
  

  hashpling

  authored and

  gitster

  committed
  03aa87e

  Copy full SHA for 03aa87e

Commits on May 25, 2009

• Change xdl_merge to generate output even for null merges

  Show description for 5719db9
  

  hashpling

  authored and

  gitster

  committed
  5719db9

  Copy full SHA for 5719db9

• t6023: merge-file fails to output anything for a degenerate merge

  Show description for 1cd1292
  

  hashpling

  authored and

  gitster

  committed
  1cd1292

  Copy full SHA for 1cd1292

Commits on Jan 31, 2009

• mergetool: fix running mergetool in sub-directories

  Show description for ff4a185
  

  hashpling

  authored and

  gitster

  committed
  ff4a185

  Copy full SHA for ff4a185

• mergetool: Add a test for running mergetool in a sub-directory

  Show description for b9b5078
  

  hashpling

  authored and

  gitster

  committed
  b9b5078

  Copy full SHA for b9b5078

Commits on Jan 27, 2009

• mergetool: respect autocrlf by using checkout-index

  Show description for 0ec7b6c
  

  hashpling

  authored and

  gitster

  committed
  0ec7b6c

  Copy full SHA for 0ec7b6c

Commits on Dec 13, 2008

• mergetool: Don't keep temporary merge files unless told to

  Show description for 162eba8
  

  hashpling

  authored and

  gitster

  committed
  162eba8

  Copy full SHA for 162eba8

• mergetool: Add prompt to continue after failing to merge a file

  Show description for b0169d8
  

  hashpling

  authored and

  gitster

  committed
  b0169d8

  Copy full SHA for b0169d8

Commits on Nov 15, 2008

• Add -y/--no-prompt option to mergetool

  Show description for 682b451
  

  hashpling

  authored and

  gitster

  committed
  682b451

  Copy full SHA for 682b451

• Fix some tab/space inconsistencies in git-mergetool.sh

  Show description for 0eea345
  

  hashpling

  authored and

  gitster

  committed
  0eea345

  Copy full SHA for 0eea345

Commits on Oct 26, 2008

• git-archive: work in bare repos

  Show description for ddff856
  

  hashpling

  authored and

  gitster

  committed
  ddff856

  Copy full SHA for ddff856

Commits on Sep 19, 2008

• Make git archive respect core.autocrlf when creating zip format archives

  Show description for b99b5b4
  

  hashpling

  authored and

  gitster

  committed
  b99b5b4

  Copy full SHA for b99b5b4

• Add new test to demonstrate git archive core.autocrlf inconsistency

  Show description for f1265cc
  

  hashpling

  authored and

  gitster

  committed
  f1265cc

  Copy full SHA for f1265cc

Commits on Mar 8, 2008

• merge-tool documentation: describe custom command usage

  Show description for caa9982
  

  hashpling

  authored and

  gitster

  committed
  caa9982

  Copy full SHA for caa9982

• git-mergetool documentaiton: show toolnames in typewriter font

  Show description for bbdfbc4
  

  hashpling

  authored and

  gitster

  committed
  bbdfbc4

  Copy full SHA for bbdfbc4

Commits on Mar 5, 2008

• Add a very basic test script for git mergetool

  Show description for 05e934b
  

  hashpling

  authored and

  gitster

  committed
  05e934b

  Copy full SHA for 05e934b

• Teach git mergetool to use custom commands defined at config time

  Show description for 964473a
  

  hashpling

  authored and

  gitster

  committed
  964473a

  Copy full SHA for 964473a

• Changed an internal variable of mergetool to support custom commands

  Show description for b3ea27e
  

  hashpling

  authored and

  gitster

  committed
  b3ea27e

  Copy full SHA for b3ea27e

• Tidy up git mergetool's backup file behaviour

  Show description for 44c36d1
  

  hashpling

  authored and

  gitster

  committed
  44c36d1

  Copy full SHA for 44c36d1

Commits on Jan 11, 2008

• gitk: Fix the Makefile to cope with systems lacking msgfmt

  Show description for 66e15a6
  

  hashpling

  authored and

  gitster

  committed
  66e15a6

  Copy full SHA for 66e15a6

Commits on Dec 21, 2007

• Remove old generated files from .gitignore.

  Show description for feb7f38
  

  hashpling

  authored and

  gitster

  committed
  feb7f38

  Copy full SHA for feb7f38

Commits on Dec 19, 2007

• Fix git-instaweb breakage on MacOS X due to the limited sed functionality

  Show description for c569969
  

  hashpling

  authored and

  gitster

  committed
  c569969

  Copy full SHA for c569969

Commits on Dec 12, 2007

• Fix clone not to ignore depth when performing a local clone

  Show description for d4110a9
  

  hashpling

  authored and

  gitster

  committed
  d4110a9

  Copy full SHA for d4110a9