Commits

Breadcrumbs

History for

on8642abc

User selector

All users

Datepicker

All time

Commit History

Commits on Apr 1, 2010

• merge: make function try_merge_command non static

  Show description for c674d05
  

  chriscool

  authored and

  gitster

  committed
  c674d05

  Copy full SHA for c674d05

Commits on Mar 21, 2010

• merge_trees(): add ancestor label parameter for diff3-style output

  Show description for 4c5868f
  

  jrn

  authored and

  gitster

  committed
  4c5868f

  Copy full SHA for 4c5868f

Commits on Jan 21, 2010

• Merge branch 'ap/merge-backend-opts'

  Show description for fcb2a7e
  gitster

  committed
  fcb2a7e

  Copy full SHA for fcb2a7e

Commits on Jan 18, 2010

• Make "subtree" part more orthogonal to the rest of merge-recursive.

  Show description for 85e51b7
  gitster

  committed
  85e51b7

  Copy full SHA for 85e51b7

• git merge -X<option>

  Show description for 8cc5b29
  

  apenwarr

  authored and

  gitster

  committed
  8cc5b29

  Copy full SHA for 8cc5b29

Commits on Nov 30, 2009

• merge-recursive: make the error-message generation an extern function

  Show description for 264b774
  

  moy

  authored and

  gitster

  committed
  264b774

  Copy full SHA for 264b774

Commits on Sep 5, 2008

• merge-recursive: move current_{file,directory}_set to struct merge_options

  Show description for 696ee23
  

  Miklos Vajna

  authored and

  gitster

  committed
  696ee23

  Copy full SHA for 696ee23

• merge-recursive: move the global obuf to struct merge_options

  Show description for c7d8492
  

  Miklos Vajna

  authored and

  gitster

  committed
  c7d8492

  Copy full SHA for c7d8492

Commits on Sep 4, 2008

• merge-recursive: move call_depth to struct merge_options

  Show description for 5033639
  

  Miklos Vajna

  authored and

  gitster

  committed
  5033639

  Copy full SHA for 5033639

Commits on Aug 31, 2008

• merge-recursive: introduce merge_options

  Show description for 8a2fce1
  

  Miklos Vajna

  authored and

  gitster

  committed
  8a2fce1

  Copy full SHA for 8a2fce1

• merge-recursive.c: Add more generic merge_recursive_generic()

  Show description for 73118f8
  

  sbeyer

  authored and

  gitster

  committed
  73118f8

  Copy full SHA for 73118f8

• Split out merge_recursive() to merge-recursive.c

  Show description for 9047ebb
  

  Miklos Vajna

  authored and

  gitster

  committed
  9047ebb

  Copy full SHA for 9047ebb

Commits on Feb 10, 2008

• Build-in merge-recursive

  Show description for e1b3a2c
  

  iabervon

  authored and

  gitster

  committed
  e1b3a2c

  Copy full SHA for e1b3a2c

Loading