Commits

Breadcrumbs

History for

on8c591db

User selector

All users

Datepicker

All time

Commit History

Commits on Sep 15, 2021

• Merge branch 'jc/trivial-threeway-binary-merge'

  Show description for c76fcf3
  gitster

  committed
  c76fcf3

  Copy full SHA for c76fcf3

Commits on Sep 5, 2021

• apply: resolve trivial merge without hitting ll-merge with "--3way"

  Show description for 57f183b
  gitster

  committed
  57f183b

  Copy full SHA for 57f183b

Commits on Aug 30, 2021

• Merge branch 'jk/apply-binary-hunk-parsing-fix'

  Show description for 7e3b9d1
  gitster

  committed
  7e3b9d1

  Copy full SHA for 7e3b9d1

Commits on Aug 10, 2021

• apply: keep buffer/size pair in sync when parsing binary hunks

  Show description for 46d723c
  

  peff

  authored and

  gitster

  committed
  46d723c

  Copy full SHA for 46d723c

Commits on Jul 1, 2021

• string-list.h users: change to use *_{nodup,dup}()

  Show description for bc40dfb
  

  avar

  authored and

  gitster

  committed
  bc40dfb

  Copy full SHA for bc40dfb

Commits on May 7, 2021

• Merge branch 'jz/apply-3way-first-message-fix'

  Show description for 6d99f31
  gitster

  committed
  6d99f31

  Copy full SHA for 6d99f31

Commits on Apr 29, 2021

• apply: adjust messages to account for --3way changes

  Show description for 526705f
  

  jerry-skydio

  authored and

  gitster

  committed
  526705f

  Copy full SHA for 526705f

Commits on Apr 8, 2021

• git-apply: allow simultaneous --cached and --3way options

  Show description for c0c2a37
  

  jerry-skydio

  authored and

  gitster

  committed
  c0c2a37

  Copy full SHA for c0c2a37

Commits on Apr 7, 2021

• git-apply: try threeway first when "--3way" is used

  Show description for 923cd87
  

  jerry-skydio

  authored and

  gitster

  committed
  923cd87

  Copy full SHA for 923cd87

Commits on Apr 2, 2021

• Merge branch 'mt/parallel-checkout-part-1'

  Show description for c47679d
  gitster

  committed
  c47679d

  Copy full SHA for c47679d

Commits on Mar 23, 2021

• entry: extract a header file for entry.c functions

  Show description for d052cc0
  

  matheustavares

  authored and

  gitster

  committed
  d052cc0

  Copy full SHA for d052cc0

Commits on Mar 14, 2021

• use CALLOC_ARRAY

  Show description for ca56dad
  

  rscharfe

  authored and

  gitster

  committed
  ca56dad

  Copy full SHA for ca56dad

Commits on Dec 18, 2020

• Merge branch 'ab/unreachable-break'

  Show description for 3517022
  gitster

  committed
  3517022

  Copy full SHA for 3517022

Commits on Dec 16, 2020

• style: do not "break" in switch() after "return"

  Show description for 56f56ac
  

  avar

  authored and

  gitster

  committed
  56f56ac

  Copy full SHA for 56f56ac

Commits on Dec 8, 2020

• Merge branch 'mt/do-not-use-scld-in-working-tree'

  Show description for 9b3b4ad
  gitster

  committed
  9b3b4ad

  Copy full SHA for 9b3b4ad

Commits on Dec 2, 2020

• apply: don't use core.sharedRepository to create working tree files

  Show description for eb3c027
  

  matheustavares

  authored and

  gitster

  committed
  eb3c027

  Copy full SHA for eb3c027

Commits on Oct 20, 2020

• apply: when -R, also reverse list of sections

  Show description for b0f266d
  

  jonathantanmy

  authored and

  gitster

  committed
  b0f266d

  Copy full SHA for b0f266d

Commits on Aug 27, 2020

• Merge branch 'jk/leakfix'

  Show description for 0d9a8e3
  gitster

  committed
  0d9a8e3

  Copy full SHA for 0d9a8e3

Commits on Aug 18, 2020

• Merge branch 'rp/apply-cached-with-i-t-a'

  Show description for ca81676
  gitster

  committed
  ca81676

  Copy full SHA for ca81676

Commits on Aug 17, 2020

• config: drop git_config_get_string_const()

  Show description for 9a53219
  

  peff

  authored and

  gitster

  committed
  9a53219

  Copy full SHA for 9a53219

Commits on Aug 9, 2020

• apply: make i-t-a entries never match worktree

  Show description for e3cc41b
  

  juped

  authored and

  gitster

  committed
  e3cc41b

  Copy full SHA for e3cc41b

Commits on Aug 6, 2020

• apply: allow "new file" patches on i-t-a entries

  Show description for 7cfde3f
  

  juped

  authored and

  gitster

  committed
  7cfde3f

  Copy full SHA for 7cfde3f

• apply: do not lazy fetch when applying binary

  Show description for 3318238
  

  jonathantanmy

  authored and

  gitster

  committed
  3318238

  Copy full SHA for 3318238

Commits on Apr 28, 2020

• Use OPT_CALLBACK and OPT_CALLBACK_F

  Show description for 203c853
  

  Denton-L

  authored and

  gitster

  committed
  203c853

  Copy full SHA for 203c853

Commits on Mar 16, 2020

• convert: permit passing additional metadata to filter processes

  Show description for ab90eca
  

  bk2204

  authored and

  gitster

  committed
  ab90eca

  Copy full SHA for ab90eca

Commits on Jan 31, 2020

• sha1-file: pass git_hash_algo to hash_object_file()

  Show description for 2dcde20
  

  matheustavares

  authored and

  gitster

  committed
  2dcde20

  Copy full SHA for 2dcde20

Commits on Dec 16, 2019

• Merge branch 'js/add-i-a-bit-more-tests'

  Show description for 011fc2e
  gitster

  committed
  011fc2e

  Copy full SHA for 011fc2e

Commits on Dec 6, 2019

• Merge branch 'jk/lore-is-the-archive'

  Show description for 3b3d9ea
  gitster

  committed
  3b3d9ea

  Copy full SHA for 3b3d9ea

• apply --allow-overlap: fix a corner case

  Show description for b4bbbbd
  

  dscho

  authored and

  gitster

  committed
  b4bbbbd

  Copy full SHA for b4bbbbd

Commits on Dec 1, 2019

• Merge branch 'en/doc-typofix'

  Show description for d3096d2
  gitster

  committed
  d3096d2

  Copy full SHA for d3096d2

Commits on Nov 30, 2019

• doc: replace public-inbox links with lore.kernel.org

  Show description for 3eae30e
  

  peff

  authored and

  gitster

  committed
  3eae30e

  Copy full SHA for 3eae30e

Commits on Nov 10, 2019

• Merge branch 'dl/apply-3way-diff3'

  Show description for eff313f
  gitster

  committed
  eff313f

  Copy full SHA for eff313f

• Fix spelling errors in code comments

  Show description for 15beaaa
  

  newren

  authored and

  gitster

  committed
  15beaaa

  Copy full SHA for 15beaaa

Commits on Oct 24, 2019

• apply: respect merge.conflictStyle in --3way

  Show description for 091489d
  

  Denton-L

  authored and

  gitster

  committed
  091489d

  Copy full SHA for 091489d

Commits on Oct 15, 2019

• Merge branch 'tg/range-diff-output-update'

  Show description for b6d712f
  gitster

  committed
  b6d712f

  Copy full SHA for b6d712f

Pagination

Previous

Next