repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t3301 (notes): use test_expect_code for clarity
2010-08-06
Jonathan Ni
e
der
ll-merge:
let caller decide
w
het
h
er to ren
o
rma
l
ize
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
ll-merge: mak
e
fla
g
easier to populate
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Nieder
Do
c
u
m
ent
a
tion/technical: documen
t
ll_merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
merge-trees: let cal
l
e
r
de
c
ide whether to renormali
z
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
an Nie
d
er
m
e
rge-tre
e
s
:
pus
h
choice to renormalize away from low
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
than Nieder
t6038 (merge
.
renorm
a
lize
)
: check that it can be turned
o
f
f
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
Nie
d
er
t
603
8
(merge
.
renormalize
)
: try checkout
-
m
a
nd cherry
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
a
t
han
N
ied
e
r
t6
0
38 (merg
e
.
r
e
n
ormaliz
e
):
s
tyle nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan
N
ieder
diff
:
spli
t
off a function for
--stat-* opt
i
on parsi
n
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-04
Jonathan Nieder
t4111
(
apply): refresh index b
e
f
ore app
l
ying
p
a
tches
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
J
o
nathan Nieder
Documen
t
a
tion: flesh ou
t
“git pull” descr
i
ption
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Ni
e
der
gi
t
web: allow
c
onfigurations
t
ha
t
change wi
t
h each
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jona
t
ha
n
Ni
e
d
e
r
t1011 (
s
parse
c
h
e
ck
o
ut): st
y
le nit
p
icks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonath
a
n Nie
d
er
ex
a
mple
s
/commit:
u
se --abbrev
for com
m
it
summary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan N
i
ed
e
r
chec
k
out, commi
t
:
remove confusing
a
ssignments to rev
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
archiv
e
: abbrevi
a
te substituted
c
ommit ids ag
a
in
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
J
o
n
athan Nied
e
r
c
onfig -
-
get --p
a
t
h
:
check for
u
nset $HOME
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
setup: s
p
l
i
t o
f
f get_dev
i
ce_or_die
helper
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
setup:
s
plit
o
f
f
a
f
unction to handle hi
t
ting
c
eiling
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
setup: spl
i
t off code to han
d
le stumbli
n
g upon
a
r
e
posit
o
ry
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
setup: split off a
function to c
h
ecks worki
n
g dir for
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
setup: split off $GIT_DIR
-
set case from setup_git_dire
c
tory
_
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan
Nieder
tests:
try git
a
pply from subdir of
t
opl
e
v
e
l
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
J
o
nathan Nieder
t
1
501 (rev
-
parse): cl
a
rify
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan
N
ieder
t340
0
(reba
s
e): whitespac
e
cle
a
nup
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nieder
t41
5
0 (am): futu
r
epr
o
o
f
against failing tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nieder
t4150
(am): style fix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
N
ieder
t/README: correct an exception when breaking a && chai
n
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
J
o
n
a
t
han Nie
d
er
Add a sample user for t
h
e svndump library
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Ni
e
der
Export par
s
e_dat
e
_basic
(
) t
o
convert a
date stri
n
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
J
ona
t
han
Nieder
Documentation:
add submodule
.
* to the
big configuration
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonat
h
an Nieder
gitmodules
.
5: url can be a re
l
ati
v
e p
a
th
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jona
t
han Nieder
g
i
t --pa
g
inate:
paginate external commands again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Nie
d
e
r
t3000
(ls-files -o): moderni
z
e style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
J
onathan Nieder
t9118 (git-svn
)
: preve
n
t
early failure from tak
i
ng
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonatha
n
N
i
e
de
r
t
/
README:
doc
u
ment more test helpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
J
o
nat
h
an Nieder
T
e
a
ch
fast-imp
o
rt to import su
b
trees named by tree id
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nied
e
r
revert: do not rebui
l
d
a
rgv on hea
p
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nied
e
r
tests: local config file sh
o
uld be h
o
nored from
s
ubdirs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Ni
e
der
t70
0
6: test pager c
o
nf
i
gurat
i
on for sev
e
ra
l
git
command
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jon
a
tha
n
Nieder
t7
0
06 (pager): introduc
e
helper for parame
t
er
i
zed tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jon
a
t
han Nieder
t3508 (cherry-pick): futu
r
ep
r
oof
against un
m
e
r
ged files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonatha
n
Nieder
g
it
-
sv
n
: stri
p
off leading sla
s
hes on --tr
u
nk arg
u
ment
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jona
t
h
an
N
ie
d
e
r
add-interactive:
C
l
arify “r
e
maining hunks in the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
grep:
r
efactor grep_objects
l
oop into its own fu
n
ction
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonatha
n
Nieder
D
o
cumentatio
n
/checkou
t
: c
l
arify descriptio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jo
n
a
th
a
n Nieder
r
ebase
-
i -p:
docum
e
n
t
shortcomings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan
Niede
r
DWIM
'
git show -5' to '
g
it show --do-walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
o
natha
n
N
ieder
gi
t
i
g
nore
.
5: C
l
a
r
ify mat
c
h
ing ru
l
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nie
d
er
r
e
base: im
p
ro
v
e error mess
a
ge wh
e
n
upst
r
eam argument
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jon
a
than Nieder
D
o
c
umentat
i
on/checkout: clarify descri
p
tio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nieder
fsck: f
i
x bogus
c
ommit head
e
r check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
Add
gi
t
remote set-branches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jo
n
athan Nie
d
er
post-
r
ec
e
ive-email: document command-line
m
ode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
t
h
an Nieder
g
i
t svn: avo
i
d uninitialized var in 'rese
t
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nied
e
r
Makefile: let header
dependency
checker o
v
erride COMPU
T
E_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nied
e
r
Mak
e
file: fix heade
r
dependency checker to a
l
l
o
w NO_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
Docum
e
nta
t
ion/notes: ni
t
picks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
a
than Nieder
D
o
cume
n
tat
i
on/no
t
es: cle
a
n
up desc
r
iption of rew
r
itin
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
t
h
an Nieder
Documentation/
n
o
tes: simpli
f
y treatment of de
f
a
u
lt
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an Nieder
Documentation/log: add a CONFIGURATION s
e
c
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
at
h
an Nieder
Docu
m
entati
o
n/n
o
tes: s
i
mpli
f
y tre
a
tme
n
t of
d
e
f
ault
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
D
o
cumentation
/
notes: add configuration
s
ectio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Docume
n
tation/n
o
tes: describe
c
ont
e
nt of
n
o
t
es bl
o
bs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
ed
e
r
Documenta
t
ion/n
o
tes: document forma
t
of notes t
r
e
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nie
d
er
cherry-pick:
do n
o
t
dump core when
i
conv fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan
N
ieder
prett
y
: ini
t
i
a
li
z
e new cmt_fmt_ma
p
to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jo
n
athan Nieder
adapt r
e
q
u
e
st-p
u
ll tests for new pull re
q
uest format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
J
o
na
t
h
an Nieder
t
e
st-lib: some shells
d
o n
o
t let $
?
propagate into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan Nieder
s
h
ortl
o
g: Document and test
-
-fo
r
mat option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
ath
a
n Ni
e
der
t4201 (sho
r
tlog
)
:
T
est outp
u
t form
a
t with multiple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
t
han Nieder
t4201 (shortlog): guard setup with test_expect_succe
s
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan N
i
eder
Documentation/
s
h
ortlog: scripted u
s
e
rs should not
r
el
y
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than
N
ieder
co
m
mit --amend:
c
op
e
with missing display name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
test-l
i
b: Let tests s
p
eci
f
y co
m
m
a
nd
s
to be
r
un at
end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonat
h
an Nied
e
r
fsck: check id
e
nt li
n
es in com
m
it objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
request-pu
l
l: protect against O
P
T
I
ONS_KEE
P
DASH
D
ASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
te
s
ts for reques
t
-pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Nieder
Doc
u
mentation/Makef
i
le: fix interr
u
pted
b
u
i
lds of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonat
h
an Niede
r
fix "bundle --stdin" segf
a
ult
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nie
d
er
t5704 (bundle): add
t
ests fo
r
bundle --stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jo
n
athan
N
iede
r
t
a
g
-
v
:
u
se
R
U
N_GIT_CMD to run verify-t
a
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonat
h
an Nieder
Document new "a
l
r
e
ady-merged" rule for br
a
nch
-d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nathan Nieder
Add
.
depen
d
d
irectories to
.
gitig
n
or
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nie
d
er
t700
6
: gua
r
d
cle
a
n
up with tes
t
_exp
e
ct_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonath
a
n N
i
e
d
er
t5800: testgi
t
help
e
r requir
e
s Pytho
n
supp
o
rt
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Niede
r
t7400: clarify submodule upda
t
e tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jon
a
than Nieder
t
7400: c
l
a
r
ify
'
submodule add' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t7400: split setup into multiple
t
ests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Niede
r
Teach maili
n
f
o
%< as an a
l
te
r
nati
v
e s
c
issors mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jo
n
athan Nieder
Ma
k
efile:
f
u
ture
-
proof
C
ygwin version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
N
ieder
merg
e
-r
e
c
u
rsive: add a l
a
bel for ancest
o
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry-pick,
r
ever
t
:
add a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
ath
a
n Nieder
r
e
vert:
clar
i
f
y
label on conf
l
i
c
t hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
com
p
a
t: add me
m
pcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan
Ni
e
der
checkout -m
-
-conflict=d
i
f
f3: add a l
a
bel
fo
r
ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan N
i
eder
merge_
t
rees():
add an
c
estor la
b
el parameter for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
m
e
rg
e
_
f
ile
(
): add comment explaining behavior wr
t
con
f
lict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Niede
r
checkout --
c
onflict=diff3: add
a la
b
el
for a
n
c
e
stor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
h
an Nieder
l
l
_mer
g
e(
)
: add anc
e
stor
l
a
be
l
parameter for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next