repo.or.cz
/
git
/
mingw
/
4msysgit
/
gitPS1fix.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/technical: avoid stray backslash in parse-options API docs
2010-08-20
Jonat
h
an
N
i
e
der
D
ocumenta
t
ion/te
c
hnical: avoi
d
stray backsla
s
h in
pa
r
se
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation:
r
emove backslashes in ma
n
page
s
y
n
opses
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
than Nieder
Docume
n
tation: clarify quoting in gitign
o
re docs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jon
a
than Nieder
Do
c
umentation:
clarify qu
o
ting in "git rm" example
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonat
h
an Nieder
D
o
cumentat
i
on
:
add missing quotes
to
"git
g
rep" ex
a
mples
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan
Nied
e
r
Documentation: clarify quo
t
ing in
"
g
it a
d
d
"
e
xample
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
J
o
nathan Nieder
D
ocument
a
tion:
u
nbreak
regex in s
h
ow-
r
e
f
manual
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonath
a
n Nieder
Docum
e
ntation: quoting trou
b
le in "git rm" di
s
cussion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Doc
u
mentation
:
tweak descri
p
t
i
o
n of lo
g
.
da
t
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-12
J
o
nathan Nieder
Stan
d
a
rdize
d
o {
.
.
.
}
while (0) style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jo
n
athan Niede
r
write
-
tree: Avoid lea
k
when ind
e
x refers to
a
n
invalid
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
J
o
nathan N
i
e
d
er
read
-
tr
e
e: stop leaking tree
obje
c
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonath
a
n N
i
ede
r
core: Sto
p
leaking o
n
disk_cac
h
e_en
t
rys
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
gitw
e
b: clarify search resu
l
ts pa
g
e when n
o
matching
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
Docum
e
ntation: add a
FILES
s
ection for show-ref
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Niede
r
Makefil
e
: add missin
g
depe
n
de
n
cy on http
.
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-09
Jonathan Nieder
Makef
i
le: add
m
iss
i
ng dep
e
nden
c
ies on u
r
l
.
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
Allow "chec
k
-ref
-
form
a
t
-
-bra
n
ch" from subdi
r
ecto
r
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
n
athan Nie
d
e
r
check
-
ref-format: handl
e
subcom
m
ands in se
p
arat
e
functions
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Nieder
D
o
c
umentati
o
n: flesh out “g
i
t pull” des
c
ription
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan
Nieder
gitweb: al
l
ow conf
i
gurations that change
w
i
t
h
each
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
examples/commit: use --abb
r
ev f
o
r commit summary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan
Nieder
che
c
k
o
ut, c
o
m
m
it: r
e
m
o
v
e confusing ass
i
gnments to rev
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
archive: abbreviate substitu
t
ed c
o
m
m
it
ids again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nie
d
er
config -
-
get --path: check for unset $HOME
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
J
onath
a
n Nieder
t3400
(rebas
e
)
:
whitesp
a
ce cle
a
nup
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jon
a
than Nieder
t
4
1
5
0
(am): fut
u
reproo
f
aga
i
n
s
t faili
n
g tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonat
h
an
Nieder
t4150 (am)
:
style fix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
J
o
n
athan Nieder
t
/
README:
c
orrect a
n
exception when breaking a && chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jona
t
han Nieder
Add
a
s
ample user f
o
r
t
he svndump library
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
athan Nieder
Export parse_date_bas
i
c() to
c
onv
e
rt a date string
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
at
h
a
n
Niede
r
Do
c
ume
n
tation: add submodule
.
* to the bi
g
co
n
figuratio
n
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jona
t
han Ni
e
de
r
g
itmo
d
u
l
es
.
5:
u
r
l
c
a
n be a relativ
e
p
ath
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
J
o
n
ath
a
n Nieder
git --paginate: paginate
external c
o
m
mands ag
a
i
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan
Nie
d
e
r
t3000 (ls-files -o
)
: m
o
de
r
nize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan N
i
eder
t9118
(git-svn): pre
v
ent early failure
f
rom ta
k
i
n
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jo
n
athan N
i
eder
t/READM
E
:
document more test helpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
Jonat
h
an N
i
eder
T
each fast-import to
i
mpor
t
sub
t
ree
s
named
b
y
t
r
ee id
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nie
d
er
revert: do not
r
ebuild argv on he
a
p
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan
Ni
e
der
te
s
ts: local conf
i
g file shoul
d
be ho
n
or
e
d
fro
m
subd
i
rs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonatha
n
N
i
eder
t7
0
06: tes
t
p
ag
e
r configuration for
severa
l
g
i
t com
m
a
nds
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonath
a
n Nieder
t7006
(pager): int
r
oduce helper for
p
aramete
r
ized tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nie
d
er
t35
0
8 (
c
h
e
rr
y
-pick): f
u
tureproof aga
i
nst
u
nmerged files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
git-sv
n
:
strip
off leading s
l
ashes on --trunk a
r
gument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jon
a
than Nie
d
er
add-interactive: Clarify “remainin
g
hunks in the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
J
onathan Nieder
grep: r
e
f
a
ctor gre
p
_objects loop into i
t
s own f
u
nct
i
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Ni
e
der
D
o
c
u
m
e
nt
a
tion/checkout: clarify d
e
scription
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan N
i
eder
rebase -
i
-p: do
c
umen
t
shortc
o
mings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jo
n
athan
Nie
d
er
DWIM 'git show -5
'
to 'git
s
how --do-wa
l
k
-5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
gitignor
e
.
5:
Clarify matching
r
u
l
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonath
a
n Nieder
rebase: improve
err
o
r mes
s
age w
h
en
up
s
tream a
r
gument
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
Doc
u
mentation/checkout: cla
r
ify descrip
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nieder
fsck: f
i
x bogus commit
hea
d
er check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jona
t
han N
i
eder
Add git remo
t
e set-branches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
po
s
t
-
receive-ema
i
l: do
c
u
m
e
n
t
com
m
and-line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nied
e
r
g
it svn
:
a
v
oi
d
uniniti
a
lized var in
'
reset'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Makefile: let header depend
e
ncy c
h
ecker o
v
e
rride COMPUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nieder
Make
f
i
le: fix header depe
n
dency checker to
a
llow
NO_CU
R
L
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
a
n Niede
r
Doc
u
mentation/n
o
te
s
: nitpi
c
ks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Do
c
ument
a
tion/
n
o
t
es:
clean up d
e
scripti
o
n
of
r
ewriti
n
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
athan Nieder
Documentation/no
t
es: simplify trea
t
ment
of defau
l
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
Niede
r
Docum
e
ntation
/
log: add
a CONFIGURATION
sect
i
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Ni
e
der
Documentation
/
notes
:
s
i
mplify treatmen
t
of def
a
ult
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/notes: add configurati
o
n section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
at
h
an
Nied
e
r
D
o
cumentation/notes: describe con
t
ent of notes blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
h
a
n
N
ieder
Docume
n
tation/notes: document
format
of notes trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
ona
t
han Nieder
c
h
er
r
y-pick: do not
d
ump core when
i
conv fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
o
nat
h
a
n Nieder
pretty: initia
l
ize ne
w
cmt_fmt
_
map
to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan
Nieder
adap
t
reques
t
-
p
u
ll tests for new
pull
reques
t
format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
J
o
nathan Nieder
t
e
st-lib
:
some shells do not let $? propagate into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nie
d
e
r
shortlog: Docume
n
t
and test --fo
r
mat opt
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nied
e
r
t4201 (sh
o
rtlog): Test ou
t
put format wi
t
h mult
i
ple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonatha
n
Niede
r
t4201 (sh
o
rtl
o
g): guard s
e
tup with test_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nied
e
r
Do
c
umentation
/
shortlog: scripted users should not rel
y
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
atha
n
Nie
d
er
commi
t
--
a
men
d
: cope with missing display name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
o
nathan Nieder
test-li
b
: Let t
e
sts
s
pecify commands to
b
e run
at
end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
onathan Nieder
fsck: check ident lines in comm
i
t objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
onathan Nieder
request-pull: p
r
otect ag
a
inst OPTIONS_KEEPDASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan
N
ie
d
er
tests for reque
s
t-pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Ni
e
der
Documentation/Makefile: fix inter
r
upt
e
d build
s
o
f
user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonat
h
an
N
ieder
fix "b
u
nd
l
e
-
-stdin" segfault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
onat
h
an
N
ieder
t5704 (
b
undle
)
: add
t
ests for bundle --stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan
Nieder
ta
g
-v: u
s
e RUN_GIT_CMD to run verify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonath
a
n N
i
ede
r
D
ocument new "already-me
r
ged" rule
for branc
h
-
d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Ni
e
der
Add
.
depend d
i
re
c
tories to
.
gitignore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
t
7006: guard cle
a
nup
with te
s
t_e
x
pect_
s
u
cce
s
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jona
t
h
an Nieder
t5800: testgit he
l
per
re
q
u
ires Python support
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t
7400: cla
r
ify submodu
l
e
update tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nie
d
er
t
7
40
0
: clarify 'submodule
ad
d
'
t
ests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t
7
4
00
:
spl
i
t
setup into multip
l
e
tes
t
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan
Ni
e
der
Teach mailinfo
%< as
a
n
a
lternative scis
s
ors
ma
r
k
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
J
onat
h
an Nied
e
r
Makefile: future-
p
r
o
of
C
ygwin version ch
e
ck
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-recursi
v
e
:
add a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
th
a
n Nieder
cherry-pick,
revert: a
d
d a lab
e
l for anc
e
s
t
or
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
revert:
c
l
arify label on conflict hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compat:
a
dd m
e
mpcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
checkout -m --c
o
nfli
c
t
=
d
iff3: add a label for a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than
Ni
e
der
merge
_
t
r
ee
s
(): add ancestor
l
abel para
m
eter fo
r
di
f
f3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
ona
t
han Nieder
mer
g
e_
f
ile(): add c
o
mment
explai
n
ing behavi
o
r
w
rt confl
i
ct
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
h
an Nieder
checko
u
t --
c
o
n
f
l
i
ct=diff3: a
d
d a l
a
bel for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next