Commits

Breadcrumbs

History for

onmain

User selector

All users

All time

Commit History

Commits on May 11, 2021

• xdiff users: use designated initializers for out_line

  Show description for 22233d4
  

  avar

  authored and

  gitster

  committed
  22233d4

  Copy full SHA for 22233d4

Commits on Jan 4, 2019

• Merge branch 'nd/the-index'

  Show description for cde5554
  gitster

  committed
  cde5554

  Copy full SHA for cde5554

Commits on Nov 13, 2018

• Merge branch 'jk/xdiff-interface'

  Show description for 39d23df
  gitster

  committed
  39d23df

  Copy full SHA for 39d23df

Commits on Nov 12, 2018

• rerere.c: remove the_repository references

  Show description for 55e6b35
  

  pclouds

  authored and

  gitster

  committed
  55e6b35

  Copy full SHA for 55e6b35

Commits on Nov 2, 2018

• xdiff: provide a separate emit callback for hunks

  Show description for 611e42a
  

  peff

  authored and

  gitster

  committed
  611e42a

  Copy full SHA for 611e42a

Commits on Oct 19, 2018

• Merge branch 'nd/the-index'

  Show description for 11877b9
  gitster

  committed
  11877b9

  Copy full SHA for 11877b9

Commits on Sep 21, 2018

• rerere.c: remove implicit dependency on the_index

  Show description for 35843b1
  

  pclouds

  authored and

  gitster

  committed
  35843b1

  Copy full SHA for 35843b1

Commits on Aug 6, 2018

• rerere: mark strings for translation

  Show description for 2373b65
  

  tgummerer

  authored and

  gitster

  committed
  2373b65

  Copy full SHA for 2373b65

Commits on Jul 16, 2018

• rerere: wrap paths in output in sq

  Show description for 28fc9ab
  

  tgummerer

  authored and

  gitster

  committed
  28fc9ab

  Copy full SHA for 28fc9ab

Commits on Sep 14, 2017

• avoid "write_in_full(fd, buf, len) != len" pattern

  Show description for 06f46f2
  

  peff

  authored and

  gitster

  committed
  06f46f2

  Copy full SHA for 06f46f2

Commits on Jun 15, 2017

• config: don't include config.h by default

  Show description for b2141fc
  

  bmwill

  authored and

  gitster

  committed
  b2141fc

  Copy full SHA for b2141fc

Commits on Oct 5, 2015

• Sync with 2.6.1

  gitster

  committed
  590f6e4

  Copy full SHA for 590f6e4

• Merge branch 'jc/rerere'

  Show description for dc5400e
  gitster

  committed
  dc5400e

  Copy full SHA for dc5400e

Commits on Sep 29, 2015

• Sync with v2.5.4

  gitster

  committed
  3adc4ec

  Copy full SHA for 3adc4ec

Commits on Sep 28, 2015

• Sync with 2.3.10

  gitster

  committed
  6343e2f

  Copy full SHA for 6343e2f

• react to errors in xdi_diff

  Show description for 3efb988
  

  peff

  authored and

  gitster

  committed
  3efb988

  Copy full SHA for 3efb988

Commits on Sep 1, 2015

• rerere: release lockfile in non-writing functions

  Show description for 9dd330e
  

  peff

  authored and

  gitster

  committed
  9dd330e

  Copy full SHA for 9dd330e

Commits on Jul 24, 2015

• rerere: use "struct rerere_id" instead of "char *" for conflict ID

  Show description for 1d51ece
  gitster

  committed
  1d51ece

  Copy full SHA for 1d51ece

• rerere: call conflict-ids IDs

  Show description for 18bb993
  gitster

  committed
  18bb993

  Copy full SHA for 18bb993

Commits on Jan 14, 2015

• standardize usage info string format

  Show description for 9c9b4f2
  

  alexhenrie

  authored and

  gitster

  committed
  9c9b4f2

  Copy full SHA for 9c9b4f2

Commits on Apr 30, 2014

• rerere: fix for merge.conflictstyle

  Show description for de3d8bb
  

  felipec

  authored and

  gitster

  committed
  de3d8bb

  Copy full SHA for de3d8bb

Commits on Jul 15, 2013

• rerere: convert to use parse_pathspec

  Show description for 01a10b0
  

  pclouds

  authored and

  gitster

  committed
  01a10b0

  Copy full SHA for 01a10b0

Commits on Aug 20, 2012

• i18n: rerere: mark parseopt strings for translation

  Show description for 0ff07f2
  

  pclouds

  authored and

  gitster

  committed
  0ff07f2

  Copy full SHA for 0ff07f2

Commits on May 8, 2011

• rerere: libify rerere_clear() and rerere_gc()

  Show description for 0f891e7
  gitster

  committed
  0f891e7

  Copy full SHA for 0f891e7

Commits on Mar 2, 2011

• rerere forget: deprecate invocation without pathspec

  Show description for 5d2c3b0
  

  j6t

  authored and

  gitster

  committed
  5d2c3b0

  Copy full SHA for 5d2c3b0

Commits on Feb 16, 2011

• rerere "remaining"

  Show description for ac49f5c
  

  Martin von Zweigbergk

  authored and

  gitster

  committed
  ac49f5c

  Copy full SHA for ac49f5c

Commits on Sep 3, 2010

• Merge branch 'jn/merge-renormalize'

  Show description for 8aed4a5
  gitster

  committed
  8aed4a5

  Copy full SHA for 8aed4a5

Commits on Aug 31, 2010

• Merge branch 'sg/rerere-gc-old-still-used'

  Show description for e24058f
  gitster

  committed
  e24058f

  Copy full SHA for e24058f

Commits on Aug 18, 2010

• Merge branch 'tf/string-list-init'

  Show description for 6b5005c
  gitster

  committed
  6b5005c

  Copy full SHA for 6b5005c

Commits on Aug 6, 2010

• rerere: migrate to parse-options API

  Show description for 672d1b7
  

  jrn

  authored and

  gitster

  committed
  672d1b7

  Copy full SHA for 672d1b7

Commits on Jul 15, 2010

• Merge branch 'js/merge-rr-fix'

  Show description for 4bd874c
  gitster

  committed
  4bd874c

  Copy full SHA for 4bd874c

Commits on Jul 14, 2010

• MERGE_RR is in .git, not .git/rr-cache

  Show description for 3ca399d
  

  jaysoffian

  authored and

  gitster

  committed
  3ca399d

  Copy full SHA for 3ca399d

• rerere: fix overeager gc

  Show description for 7d7ff15
  

  szeder

  authored and

  gitster

  committed
  7d7ff15

  Copy full SHA for 7d7ff15

Commits on Jul 5, 2010

• string_list: Add STRING_LIST_INIT macro and make use of it.

  Show description for 183113a
  

  tfarina

  authored and

  gitster

  committed
  183113a

  Copy full SHA for 183113a

Commits on Jun 30, 2010

• Merge branch 'jp/string-list-api-cleanup'

  Show description for a53deac
  gitster

  committed
  a53deac

  Copy full SHA for a53deac