Commits

History for

Commits on Mar 17, 2022

Merge branch 'ab/object-file-api-updates'
gitster
committed
430883a

Commits on Mar 4, 2022

range-diff: plug memory leak in common invocation

avar
authored and
gitster
committed
4998e93

Commits on Feb 26, 2022

object-file API: have hash_object_file() take "enum object_type"

avar
authored and
gitster
committed
44439c1
object-file API: have write_object_file() take "enum object_type"

avar
authored and
gitster
committed
c80d226

Commits on Feb 16, 2022

Merge branch 'en/remerge-diff'
gitster
committed
90b7153

Commits on Feb 5, 2022

Merge branch 'rs/apply-symlinks-use-strset'
gitster
committed
4bb003d

Commits on Feb 2, 2022

ll-merge: make callers responsible for showing warnings

newren
authored and
gitster
committed
35f6967

Commits on Jan 10, 2022

Merge branch 'ja/i18n-similar-messages'
gitster
committed
c17de5a
Merge branch 'jz/apply-3-corner-cases'
gitster
committed
bc61dba

Commits on Jan 7, 2022

apply: use strsets to track symlinks

rscharfe
authored and
gitster
committed
4e9a325

Commits on Jan 5, 2022

i18n: factorize "--foo outside a repository"

jnavila
authored and
gitster
committed
59bb000
i18n: turn "options are incompatible" into "cannot be used together"

jnavila
authored and
gitster
committed
12909b6

Commits on Dec 20, 2021

git-apply: skip threeway in add / rename cases

jerry-skydio
authored and
gitster
committed
34d6070

Commits on Dec 13, 2021

git-apply: add --allow-empty flag

jerry-skydio
authored and
gitster
committed
324eb77
git-apply: add --quiet flag

jerry-skydio
authored and
gitster
committed
c21b8ae

Commits on Sep 15, 2021

Merge branch 'jc/trivial-threeway-binary-merge'
gitster
committed
c76fcf3

Commits on Sep 5, 2021

apply: resolve trivial merge without hitting ll-merge with "--3way"
gitster
committed
57f183b

Commits on Aug 30, 2021

Merge branch 'jk/apply-binary-hunk-parsing-fix'
gitster
committed
7e3b9d1

Commits on Aug 10, 2021

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

peff
authored and
gitster
committed
46d723c

Commits on Jul 1, 2021

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

avar
authored and
gitster
committed
bc40dfb

Commits on May 7, 2021

Merge branch 'jz/apply-3way-first-message-fix'
gitster
committed
6d99f31

Commits on Apr 29, 2021

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

jerry-skydio
authored and
gitster
committed
526705f

Commits on Apr 8, 2021

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

jerry-skydio
authored and
gitster
committed
c0c2a37

Commits on Apr 7, 2021

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

jerry-skydio
authored and
gitster
committed
923cd87

Commits on Apr 2, 2021

Merge branch 'mt/parallel-checkout-part-1'
gitster
committed
c47679d

Commits on Mar 23, 2021

entry: extract a header file for entry.c functions

matheustavares
authored and
gitster
committed
d052cc0

Commits on Mar 14, 2021

use CALLOC_ARRAY

rscharfe
authored and
gitster
committed
ca56dad

Commits on Dec 18, 2020

Merge branch 'ab/unreachable-break'
gitster
committed
3517022

Commits on Dec 16, 2020

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

avar
authored and
gitster
committed
56f56ac

Commits on Dec 8, 2020

Merge branch 'mt/do-not-use-scld-in-working-tree'
gitster
committed
9b3b4ad

Commits on Dec 2, 2020

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

matheustavares
authored and
gitster
committed
eb3c027

Commits on Oct 20, 2020

apply: when -R, also reverse list of sections

jonathantanmy
authored and
gitster
committed
b0f266d

Commits on Aug 27, 2020

Merge branch 'jk/leakfix'
gitster
committed
0d9a8e3

Commits on Aug 18, 2020

Merge branch 'rp/apply-cached-with-i-t-a'
gitster
committed
ca81676

Commits on Aug 17, 2020

config: drop git_config_get_string_const()

peff
authored and
gitster
committed
9a53219