repo.or.cz
/
git
/
barrbrain.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: remove backslashes in manpage synopses
2010-08-20
J
onathan
N
ieder
Documentation
:
remov
e
backslash
e
s in
m
a
n
page sy
n
opses
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jona
t
han N
i
eder
Documentation: cl
a
rify
quoti
n
g
in gitignore docs
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
than Nieder
Do
c
ument
a
tion: clarify quoti
n
g in "git
rm" exa
m
p
l
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
D
o
cumentation: add m
i
ssing qu
o
t
es to "git gr
e
p" ex
a
mples
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan
N
ieder
Doc
u
mentation: clarify
q
uo
t
ing in "git add" example
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jo
n
athan Nieder
Documentati
o
n
: unbreak reg
e
x in sh
o
w-ref
m
a
n
ual
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonat
h
an Nieder
Doc
u
mentation: quoting tr
o
ub
l
e in "git r
m
"
d
iscuss
i
on
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentatio
n
: tweak
descri
p
tion of l
o
g
.
date
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-12
Jonath
a
n Nieder
Sta
n
dardiz
e
d
o
{
.
.
.
}
w
hile (0) sty
l
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-11
Jo
n
athan Nieder
write-tree:
A
void
l
e
ak wh
e
n index refers
t
o an inv
a
l
id
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-11
J
onathan Nieder
r
e
ad-tree: stop leaking
tree object
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-11
J
onatha
n
Nied
e
r
c
ore: S
t
op le
a
king ondisk_c
a
c
he_entrys
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jon
a
t
h
a
n
Ni
e
der
g
itweb: c
l
a
rif
y
sea
r
ch
r
esu
l
ts pa
g
e when no matchi
n
g
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jonat
h
an Nieder
Documen
t
ation: add a FILES sectio
n
for show
-
ref
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-09
J
o
nath
a
n
Nied
e
r
Makefile: add m
i
ssing depend
e
ncy on http
.
h
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
Makefile: add miss
i
ng depend
e
ncies on u
r
l
.
h
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan N
i
eder
Allow "ch
e
ck-ref-format --
b
r
anc
h
" fr
o
m subdirectory
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nie
d
er
check-r
e
f-f
o
rmat: han
d
le subc
o
mmands in sep
a
rate functions
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jona
t
h
a
n Ni
e
der
D
ocum
e
ntation:
flesh out “git
pull” de
s
crip
t
ion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
J
o
nathan Nieder
g
itweb: all
o
w conf
i
gu
r
ations that change with each
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan
N
ieder
examples
/
commi
t
: use
-
-
abbrev for commit sum
m
ary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan
N
ieder
ch
e
ckout, commit:
remov
e
confusing assignm
e
nts to rev
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jon
a
than N
i
ed
e
r
archive: abbreviate sub
s
tit
u
ted
c
omm
i
t ids a
g
a
i
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jo
n
athan Nieder
config --get
--
p
ath: ch
e
ck for unset
$HOM
E
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nieder
t3400 (rebase)
:
whit
e
space c
l
ea
n
u
p
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nieder
t41
5
0
(am):
futurepro
o
f against
failin
g
tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-23
Jonath
a
n Nied
e
r
t4150 (am)
:
style fi
x
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nied
e
r
t
/
README: correct an exception w
h
en breaking a && chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonathan
N
ieder
A
d
d a sam
p
l
e
user for the
svndum
p
libr
a
r
y
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
J
o
n
athan
N
ied
e
r
Expor
t
p
a
rse_
d
ate_b
a
sic(
)
to c
o
n
vert a date str
i
ng
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
N
ie
d
er
D
o
cu
m
entation:
a
d
d sub
m
odule
.
*
to the big c
o
nfiguration
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
J
onathan Nieder
g
i
t
mo
d
ules
.
5
: url ca
n
b
e a r
e
la
t
ive path
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nieder
git --paginate:
paginate e
x
ter
n
al co
m
mands again
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jon
a
than N
i
eder
t3000
(ls-
f
iles -o): m
o
d
e
r
n
i
ze style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-08
Jona
t
h
a
n N
i
ede
r
t9118 (
g
i
t
-
sv
n
): prevent e
a
rly
f
ailure f
r
om taking
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jonath
a
n Nieder
t
/
README: docume
n
t more tes
t
hel
p
ers
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-05
Jonathan
N
ieder
Teach
f
ast-import
t
o impo
r
t su
b
t
r
ees na
m
ed b
y
t
ree id
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Niede
r
rev
e
r
t
: do not r
e
build argv on
h
eap
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonatha
n
Nieder
t
es
t
s:
l
ocal
c
onfig file should be
h
onored
f
r
o
m
s
ubdirs
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t7006
:
t
e
st p
a
ger c
o
nf
i
guration
f
or sev
e
ral git commands
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonatha
n
N
i
eder
t7006 (pag
e
r):
i
ntroduce helper for parame
t
e
r
ize
d
tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonat
h
an Ni
e
der
t3508 (c
h
erry-
p
i
c
k): fut
u
r
e
proof again
s
t unmerged files
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
J
onath
a
n Nie
d
er
git-svn: stri
p
off leading slashes o
n
--tr
u
nk argu
m
ent
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
J
o
nathan Nied
e
r
a
d
d-
i
nteractive
:
Clarify “remaining hunks
in th
e
file”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jo
n
a
than Nieder
grep: refactor grep_objects loop into its o
w
n function
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan N
i
e
der
Docu
m
entatio
n
/checkout: clari
f
y descript
i
on
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jon
a
than Nieder
rebase -i -
p
: d
o
cument sh
o
rtcomings
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-02
Jo
n
at
h
an
N
ied
e
r
DWIM 'git show -5' to
'git s
h
o
w
--do
-
w
a
lk
-5'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
g
i
tignor
e
.
5
:
Clarify match
i
n
g
rul
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
J
o
natha
n
Nieder
rebase: improve error mess
a
ge when ups
t
ream argu
m
ent
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jon
a
t
h
an Nieder
Documentatio
n
/checkout: clarify d
e
s
cri
p
tion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
J
onathan Nieder
f
sck: fix bogus commi
t
hea
d
e
r
check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
Add gi
t
r
emote set-branches
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
post-
r
ec
e
i
v
e-email: docum
e
nt command-l
i
ne mode
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan
N
ieder
git s
v
n: avo
i
d uninitializ
e
d v
a
r in 'reset'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ied
e
r
Makefile: let head
e
r
depend
e
ncy
checker overri
d
e
COMPU
T
E_HEA
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Ni
e
der
M
akefile: fix header d
e
pen
d
e
ncy checker
to allow NO_CURL
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Document
a
tion/not
e
s:
nitpi
c
k
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nie
d
er
Document
a
tion/notes: clean up d
e
scr
i
p
tion of rewrit
i
n
g
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
h
a
n N
i
eder
Documentat
i
on/not
e
s: simplify tr
e
a
t
m
e
nt of
default
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Ni
e
d
er
Document
a
tion/lo
g
:
add a CONFIGURATION sect
i
on
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nieder
Do
c
umenta
t
ion/
n
otes: si
m
plify treatmen
t
of default
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onath
a
n Nieder
Documentat
i
on/notes: add
c
onfig
u
rati
o
n sec
t
i
o
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Docume
n
tation/notes: describe content
o
f
notes b
l
ob
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than
Nieder
Do
c
umentation/notes
:
d
ocumen
t
format of note
s
trees
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
J
onath
a
n N
i
ede
r
cherry-
p
ick
:
d
o n
o
t dump co
r
e
w
h
e
n iconv fails
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonat
h
an
N
ieder
pretty: initializ
e
new cmt_f
m
t_m
a
p to 0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jona
t
han N
i
ede
r
adap
t
request-pu
l
l test
s
fo
r
new pull request format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
Jo
n
athan Nieder
tes
t
-lib: some s
h
ells do
n
ot l
e
t
$? pr
o
pagate int
o
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
Nie
d
er
sho
r
tlog: Document and te
s
t
--format opt
i
on
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
a
n
N
iede
r
t
4201 (shor
t
log): Test output
f
ormat wit
h
multiple
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han Nieder
t4201 (shortlo
g
): guard setup with te
s
t_exp
e
c
t_succes
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
Document
a
tion/sh
o
rtlog: scripted users should
n
ot r
e
ly
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan Nieder
comm
i
t --amend: cope
w
ith mi
s
sing display
name
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than Nie
d
er
test
-
l
ib:
L
et tests s
p
e
c
ify co
m
mands to be run at e
n
d
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jona
t
han Nieder
fs
c
k: check iden
t
line
s
in comm
i
t
objects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jona
t
ha
n
N
i
eder
request-pull: protect agai
n
st OPTIONS_KEE
P
DASHDASH
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonat
h
an
N
ieder
test
s
for request-
p
ull
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
Jo
n
athan
Nieder
Docum
e
n
t
ation/Ma
k
efi
l
e: fix interrupted builds
o
f user
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Ni
e
der
fix "bundl
e
--stdin" seg
f
ault
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
J
onathan N
i
eder
t5
7
04 (bundl
e
): add tests for bundle --stdin
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jonat
h
a
n Nieder
ta
g
-v:
u
se
RUN_GIT_CMD
to
r
un verify-tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
D
ocum
e
nt new "already-merged" rule for br
a
nc
h
-d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jon
a
than
Nieder
Add
.
depend directories to
.
g
i
tignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nie
d
er
t
7006: guard
cleanup
w
ith test_expe
c
t_succ
e
ss
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan N
i
eder
t
5800: testgit helper
r
equ
i
res Python support
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan
N
ieder
t7400:
c
l
arify sub
m
odule u
p
d
a
te tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
J
o
nathan Nie
d
er
t7400: clarify 'subm
o
dule add
'
tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
J
onathan Nieder
t7400: split setup
into m
u
ltiple
t
es
t
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nieder
T
e
ach mai
l
info %< as an alter
n
ativ
e
scissor
s
m
ark
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jon
a
than N
i
ede
r
Makefile:
fut
u
r
e
-pr
o
of Cygwin version
c
h
e
c
k
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nie
d
er
merge-recursi
v
e: a
d
d
a
label for ances
t
o
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
c
herr
y
-pick, revert: add a label for
a
ncestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an N
i
ede
r
revert
:
clarify l
a
bel on conf
l
i
c
t hunks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
e
r
compat: add m
e
m
pcpy()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
c
heckout
-
m --co
n
flict
=
dif
f
3
:
add
a la
b
el
f
or ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_trees(): add
a
ncestor la
b
el pa
r
ameter for d
i
ff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
mer
g
e_file(): add
comment explaining behavior wrt
c
o
nf
l
ic
t
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
check
o
u
t
--conf
l
ict=diff3: add a
label for an
c
estor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than
Nieder
ll_merge
(
): add
a
nce
s
tor label paramet
e
r
f
o
r
diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next