repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
config: always parse GIT_CONFIG_PARAMETERS during git_config
2010-08-06
J
o
n
athan Nieder
rerere: migr
a
te to parse-o
p
tions API
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonatha
n
N
ieder
t4200 (rer
e
re):
mod
e
rnize
s
t
y
le
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonath
a
n Nieder
l
l
-
m
er
g
e: le
t
caller d
e
cide whether to renormalize
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan
Nieder
l
l-mer
g
e: make flag easier to populat
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
Documentation/technical: document ll_merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
a
t
h
an Nieder
merge-trees: let cal
l
er decid
e
whether t
o
renormal
i
ze
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Nieder
merge-trees: push choic
e
to renormalize away from low
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
Nied
e
r
t6038
(
merge
.
reno
r
malize): chec
k
that
it can be turned off
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nied
e
r
t6038
(
merge
.
re
n
ormalize
)
: try
che
c
kout -m and
c
herry
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nied
e
r
t6038 (m
e
rge
.
renormalize): style
nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
ied
e
r
diff: split off a function f
o
r --stat-* option parsi
n
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-04
J
o
nathan
Niede
r
t4111
(
apply): refres
h
i
nd
e
x be
f
ore applying
p
atche
s
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Nieder
D
o
cumentation: f
l
e
sh out
“
g
it
p
ull
”
descript
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jo
n
athan Nieder
g
i
tweb: a
l
l
o
w configurations that c
h
ange with
e
ach
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
J
onatha
n
Nieder
t101
1
(sparse checkout)
:
style nitp
i
cks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nied
e
r
exam
p
les
/
commi
t
: use
-
-abbrev for comm
i
t
summary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonatha
n
N
iede
r
checkout, commit:
rem
o
ve
c
on
f
u
sing as
s
ig
n
ments to rev
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
archive: abbrevia
t
e substitu
t
e
d
com
m
it
ids again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jon
a
than Nieder
config --get --path: check for
unset $HOME
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Ni
e
der
setup: split off get_device
_
or_die helper
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jon
a
than
Nie
d
er
setup: sp
l
it off a
f
u
nction to handle hitting
ceiling
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Niede
r
setup: split off co
d
e to h
a
ndle st
u
mbling upon a repo
s
itory
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan
N
ieder
setup: split off a function t
o
checks w
o
rk
i
ng dir for
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Niede
r
setup: s
p
lit off $G
I
T_DIR-s
e
t
cas
e
f
r
om set
u
p_git_di
r
ectory_
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonat
h
an N
i
eder
t
ests: t
r
y gi
t
apply from
s
ubdir of to
p
level
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
t1501 (rev-par
s
e):
clarify
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonatha
n
Nieder
t3
4
00 (r
e
b
a
se):
w
h
itespace cleanup
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
J
onat
h
an Niede
r
t41
5
0 (am): futureproof
a
gainst
f
ail
i
ng tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nieder
t4150 (am): style
f
ix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonatha
n
Nieder
t/
R
EADME: cor
r
ect an ex
c
eption
w
he
n
breaking a && cha
i
n
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jona
t
han Nieder
Add a sampl
e
user f
o
r the
s
vndump library
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
N
ied
e
r
Export parse_
d
ate_basic
(
) to convert a date
s
t
r
in
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
N
i
e
d
e
r
Documentati
o
n: ad
d
submodule
.
* to
the big configuration
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan N
i
eder
gitmo
d
ules
.
5: url can b
e
a
r
elative path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
J
onathan Nie
d
er
git --paginate: pag
i
nat
e
e
xternal co
m
mands again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jo
n
atha
n
Nie
d
e
r
t30
0
0 (ls-fi
l
es -o): moder
n
ize sty
l
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jonath
a
n Nieder
t9118
(
git-
s
v
n
): prev
e
nt early fai
l
ure from taking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
J
o
n
a
tha
n
Nieder
t/README:
d
o
c
ument mor
e
test helpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
Jonathan Nieder
Teach fast-import to
i
mport subtrees nam
e
d
b
y
t
r
e
e id
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jon
a
than Nieder
revert: do not rebuild argv on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
J
o
natha
n
Nieder
tes
t
s: l
o
cal co
n
fig f
i
le
s
ho
u
ld be hono
r
e
d
f
rom sub
d
irs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonath
a
n Nieder
t
7006: test pager co
n
f
i
guration for seve
r
al git com
m
ands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan
Nie
d
er
t7
0
06 (pa
g
er): i
n
troduce helper
f
o
r parameterize
d
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nie
d
er
t
3
5
08
(
cherry-
p
ick)
:
f
u
t
ureproof against unmerg
e
d files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nie
d
er
gi
t
-
s
v
n
: strip o
f
f leadi
n
g sl
a
shes on --trun
k
argum
e
nt
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan
Niede
r
add-intera
c
tive: Clarify “
r
e
maining hunks in the f
i
le”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jona
t
h
a
n
Nieder
grep
:
refa
c
tor
g
rep_o
b
j
ects loop into its own func
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
Document
a
t
i
on/c
h
e
c
k
out: cla
r
ify description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonatha
n
Nieder
rebas
e
-i
-
p: d
o
cu
m
ent shortcomings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
J
onath
a
n
Nied
e
r
DW
I
M 'git show
-5'
t
o 'git s
h
ow --do-walk
-5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan N
i
eder
giti
g
nore
.
5:
C
larify matching rul
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jo
n
athan
Nieder
re
b
ase: im
p
rove error message when
u
pstre
a
m argum
e
n
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
ona
t
han Nieder
Documentati
o
n/checkout: clarify
d
escripti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Niede
r
fsc
k
:
fix bogus commit he
a
der check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonat
h
an Nieder
A
dd
g
it remote set-bra
n
ches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonat
h
an Nie
d
er
p
ost-re
c
eive-
e
mail:
document comm
a
nd-li
n
e mod
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than Nieder
git svn:
av
o
id uninitialized var in 'reset'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
ha
n
N
ieder
Makefile: let h
e
ader depend
e
nc
y
che
c
k
er override CO
M
PUTE
_
HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Nieder
M
a
kefile: f
i
x
header
dep
e
ndency chec
k
er to allow N
O
_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Docum
e
ntation/note
s
:
ni
t
picks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Doc
u
mentation/notes: clean up
descriptio
n
o
f
rewriting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Niede
r
Documen
t
ation/no
t
es: simplify treatment of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/l
o
g: add a CONF
I
GURATION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nieder
Documentati
o
n/notes: s
i
mpl
i
fy tr
e
atment of defau
l
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Docum
e
ntat
i
on/notes: add configurat
i
on
s
ection
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
th
a
n Nieder
D
o
cumentati
o
n/notes: d
e
scribe content
of
n
otes blob
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nieder
Docume
n
tation
/
notes: document
f
o
r
mat of no
t
es trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jo
n
ath
a
n N
i
eder
cherry-
p
i
c
k: do not 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 Nieder
pretty: initial
i
ze
new cmt_fmt_map to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jo
n
athan
Nie
d
er
adapt
r
eq
u
est-pul
l
tests
f
or new pull request format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
J
o
nathan Nieder
test-lib:
some s
h
e
lls do n
o
t let $? propagate into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
o
nat
h
an Nie
d
er
shortlog
:
Document and test --
f
ormat opt
i
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
N
i
e
de
r
t420
1
(short
l
og): T
e
st
o
ut
p
ut format with mu
l
tipl
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonatha
n
Nieder
t4
2
01 (shortlog): guard set
u
p
w
ith test_expect_succ
e
ss
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
Nieder
Documentation/sho
r
tlog:
s
cr
i
pted u
s
er
s
sho
u
ld not rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
onathan Nieder
commit --amend:
cope with missi
n
g
di
s
pl
a
y name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han Nieder
t
e
st-lib: Let
t
ests specify c
o
mmands to be r
u
n
at end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
o
nath
a
n
Nieder
fsck
:
check ident
lines in commit obje
c
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
o
nathan
N
i
eder
request
-
p
u
ll
:
protect ag
a
inst OPTIONS_KEEPDAS
H
DA
S
H
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan
N
ieder
tests for request
-
pul
l
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan
Nieder
Do
c
ument
a
tion/Makefile: f
i
x interrup
t
ed bu
i
lds of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan
N
ieder
fix
"
bundle --stdin" s
e
gfault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
on
a
th
a
n Nied
e
r
t5704
(bund
l
e
)
:
a
dd tests for bundle --stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
J
onathan Nie
d
er
tag -
v
: use RUN_GIT_CMD to run
v
eri
f
y
-
tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Ni
e
d
er
Document new "already-merged" rul
e
for
b
ra
n
ch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jona
t
han Nie
d
e
r
Add
.
d
e
pen
d
d
i
r
ectories to
.
gi
t
i
g
n
o
re
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jo
n
athan Nieder
t7006: guard clea
n
up with test_expect_su
c
ces
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
J
o
n
ath
a
n Nied
e
r
t5800
:
te
s
tgit
h
e
l
p
e
r requi
r
es
P
ython
su
p
port
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t74
0
0: clarif
y
submo
d
u
l
e
update tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Ni
e
der
t7400: clar
i
fy 'submodule a
d
d
' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t7400: split
s
e
t
up into multiple t
e
sts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nieder
Teach
m
ailinfo %< as an a
l
ter
n
ative s
c
issors mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nie
d
e
r
Makefile: fu
t
ure-p
r
oof
Cygwin v
e
rs
i
o
n check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
a
t
han Nieder
merge
-
r
ecursi
v
e:
ad
d
a
l
abel for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry-pick
,
revert: add
a
l
abel for
a
ncestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nath
a
n
Nieder
reve
r
t: clar
i
fy labe
l
on conf
l
ict hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
than
Nieder
compa
t
: add mempcpy
(
)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Niede
r
checkout -m --con
f
li
c
t=diff3: add a label fo
r
anc
e
s
tor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
ona
t
han Nie
d
er
merge_trees(): ad
d
a
n
c
est
o
r lab
e
l parameter for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_fil
e
(): a
d
d comment explain
i
n
g
behav
i
o
r
wrt conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
next