Commits

Breadcrumbs

History for

oncdacb62

User selector

All users

Datepicker

All time

Commit History

Commits on Aug 14, 2005

• [PATCH] Make sure git-resolve-script always works on commits

  Show description for 02a4a32
  

  Linus Torvalds

  authored and

  Junio C Hamano

  committed
  02a4a32

  Copy full SHA for 02a4a32

Commits on Jul 23, 2005

• [PATCH] Audit rev-parse users.

  Show description for f6e1a4d
  

  Junio C Hamano

  authored and

  Linus Torvalds

  committed
  f6e1a4d

  Copy full SHA for f6e1a4d

Commits on Jul 9, 2005

• Make "git resolve" take the merge message in $3

  Show description for 3ba513c
  

  Linus Torvalds

  committed
  3ba513c

  Copy full SHA for 3ba513c

Commits on Jul 8, 2005

• Add "git-sh-setup-script" for common git shell script setup

  Show description for b33e966
  

  Linus Torvalds

  committed
  b33e966

  Copy full SHA for b33e966

Commits on Jun 21, 2005

• Clean up different special *HEAD handling

  Show description for 6b38a40
  

  Linus Torvalds

  committed
  6b38a40

  Copy full SHA for 6b38a40

Commits on Jun 20, 2005

• [PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse

  Show description for c591412
  

  holmsand

  authored and

  Linus Torvalds

  committed
  c591412

  Copy full SHA for c591412

• Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.

  Show description for 55a716c
  

  Linus Torvalds

  committed
  55a716c

  Copy full SHA for 55a716c

Commits on Jun 15, 2005

• Trivial git script fixups

  Show description for 40d8cfe
  

  Linus Torvalds

  committed
  40d8cfe

  Copy full SHA for 40d8cfe

Commits on Jun 8, 2005

• Make "git commit" work correctly in the presense of a manual merge

  Show description for 9c06531
  

  Linus Torvalds

  committed
  9c06531

  Copy full SHA for 9c06531

• Make default merge messages denser.

  Show description for 5b1ea09
  

  Linus Torvalds

  committed
  5b1ea09

  Copy full SHA for 5b1ea09

Commits on Jun 7, 2005

• git-resolve-script: stop when the automated merge fails

  Show description for e5b905c
  

  Linus Torvalds

  committed
  e5b905c

  Copy full SHA for e5b905c

• git-resolve-script: don't wait for three seconds any more

  Show description for 3f4eff7
  

  Linus Torvalds

  committed
  3f4eff7

  Copy full SHA for 3f4eff7

Commits on Jun 6, 2005

• More work on merging with git-read-tree..

  Show description for 220a0b5
  

  Linus Torvalds

  committed
  220a0b5

  Copy full SHA for 220a0b5

• git-read-tree: be a lot more careful about merging dirty trees

  Show description for 02ede67
  

  Linus Torvalds

  committed
  02ede67

  Copy full SHA for 02ede67

Commits on May 31, 2005

• git-resolve-script: use "git-apply --stat" instead of diffstat

  Show description for 866b973
  

  Linus Torvalds

  committed
  866b973

  Copy full SHA for 866b973

Commits on May 25, 2005

• [PATCH] optimize git-resolve-script

  Show description for ea88ee4
  

  jgarzik

  authored and

  Linus Torvalds

  committed
  ea88ee4

  Copy full SHA for ea88ee4

Commits on May 10, 2005

• Introduce GIT_DIR environment variable.

  Show description for 8ac069a
  

  Junio C Hamano

  committed
  8ac069a

  Copy full SHA for 8ac069a

Commits on May 5, 2005

• Fix git-resolve-script.

  Show description for d5a72fd
  

  Linus Torvalds

  committed
  d5a72fd

  Copy full SHA for d5a72fd

• Split "git-pull-script" into two parts

  Show description for 67cc5c4
  

  Linus Torvalds

  committed
  67cc5c4

  Copy full SHA for 67cc5c4

Loading