Commits

Breadcrumbs

History for

on8642abc

User selector

All users

Datepicker

All time

Commit History

Commits on Mar 21, 2010

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

  Show description for f01de62
  

  jrn

  authored and

  gitster

  committed
  f01de62

  Copy full SHA for f01de62

Commits on Jan 21, 2010

• Merge branch 'jc/conflict-marker-size'

  Show description for 06dbc1e
  gitster

  committed
  06dbc1e

  Copy full SHA for 06dbc1e

Commits on Jan 18, 2010

• git merge -X<option>

  Show description for 8cc5b29
  

  apenwarr

  authored and

  gitster

  committed
  8cc5b29

  Copy full SHA for 8cc5b29

Commits on Jan 17, 2010

• rerere: honor conflict-marker-size attribute

  Show description for 8588567
  gitster

  committed
  8588567

  Copy full SHA for 8588567

Commits on Feb 18, 2008

• merge-recursive: split low-level merge functions out.

  Show description for 525ab63
  gitster

  committed
  525ab63

  Copy full SHA for 525ab63

Loading