repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ab/require-perl-5.8'
2010-08-06
Jon
a
than Nieder
t4200 (r
e
rere): modernize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan Nieder
ll-merge: let caller d
e
cide w
h
e
t
her to renormal
i
ze
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan
N
ieder
ll-merge: ma
k
e flag easier to popula
t
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
an Nied
e
r
Do
c
umentation/
t
echnical: document l
l
_merge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
a
n
Ni
e
d
e
r
m
e
rge-trees: let c
a
ll
e
r deci
d
e whether to r
e
normal
i
ze
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Ni
e
de
r
m
e
rge-trees: push ch
o
ice t
o
r
enormalize away
f
rom low
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
n
a
than Nieder
t6038 (merge
.
renormalize): check that it c
a
n be
turn
e
d off
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
t6
0
38
(me
r
ge
.
renormalize): try
c
heckout -
m
and che
r
r
y
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
ie
d
er
t6038 (merge
.
renormalize): style nitpick
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan Nied
e
r
diff: split of
f
a fu
n
c
t
i
on for --stat-* option
p
arsi
n
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-04
Jonath
a
n Nieder
t411
1
(
apply): refresh index before
appl
y
ing patches
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan
Ni
e
der
Documentation: fl
e
sh ou
t
“gi
t
pul
l
” descr
i
ptio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Jonathan Nieder
gitweb: al
l
o
w conf
i
guration
s
that
change wit
h
each
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
J
ona
t
han Nieder
t
1011 (sparse
check
o
u
t
)
:
s
t
yl
e
nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
examples/
c
ommi
t
: use --abbrev for
c
ommit summa
r
y
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonatha
n
Nieder
checkout,
c
ommit: remo
v
e
c
onf
u
si
n
g assignments to rev
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan
N
ieder
arc
h
i
v
e
: abbr
e
viate substitute
d
c
ommit ids
again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonatha
n
Nieder
conf
i
g --get --path: check
f
o
r
unset $HOME
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
J
o
nathan Nieder
setup: split off get_
d
e
vice
_
or_d
i
e
helper
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
se
t
up: s
p
l
it off
a
fu
n
c
t
i
o
n to handle hi
t
ting
c
eil
i
ng
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Nieder
setup: split o
f
f c
o
de to handle stumbling upon a repo
s
itory
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jona
t
han N
i
ede
r
setup: spl
i
t
o
f
f a function to checks worki
n
g dir for
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
J
onathan Ni
e
der
s
e
tup: spli
t
off $GIT_DIR-
s
et case
f
rom
setup_git_dire
c
tory_
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan Niede
r
tests: try git
a
pply
f
rom s
u
bdir of toplevel
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-26
Jonathan
Nieder
t1501 (rev-parse
)
: clarify
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan Nieder
t3400
(rebase): whitespace cleanup
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
J
onat
h
an Nieder
t4150 (am): f
u
tureproo
f
aga
i
nst failing tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-23
Jonathan
Nieder
t415
0
(am): style
f
ix
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
J
o
nathan Nie
d
e
r
t/README: c
o
rrect a
n
exception when breaking a && chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
J
onathan Nied
e
r
Add a sa
m
ple user f
o
r th
e
s
vndum
p
lib
r
ary
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
J
o
nath
a
n
Nieder
E
xport parse_date_basic
(
) to convert a d
a
t
e
string
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
J
onathan Niede
r
Docume
n
t
a
t
ion: add submo
d
ul
e
.
*
to the b
i
g configuration
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
J
o
nathan
N
ie
d
er
gitmodul
e
s
.
5: url
c
an
be a relative p
a
th
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonat
h
an Niede
r
git --pagina
t
e: paginate external
com
m
ands
again
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jonath
a
n
N
iede
r
t3000
(
l
s
-
f
iles
-o): modernize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jonat
h
an Nieder
t
9
1
1
8
(git-s
v
n): preve
n
t early fa
i
lure from
t
aking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
J
o
n
a
than
Nieder
t/README: do
c
ument mo
r
e
test helpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
Jonathan
N
ieder
Teach fast-im
p
or
t
t
o impor
t
sub
t
r
e
e
s
nam
e
d by tree id
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jonat
h
an Nieder
revert: d
o
not re
b
uild argv on hea
p
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
J
o
nathan Niede
r
tests: local c
o
nfig file should
be honored from subdirs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jon
a
t
han Nieder
t
7
0
06
:
t
e
s
t page
r
c
o
n
f
igur
a
tio
n
for sever
a
l g
i
t commands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Niede
r
t7006
(
page
r
): introd
u
ce helper for
p
ara
m
eterized tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Ni
e
der
t3508 (
c
herry
-
pick)
:
futureproo
f
against
u
nmer
g
ed files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonatha
n
N
i
e
der
git-svn:
strip
o
f
f
leading
s
las
h
es
o
n --
t
r
unk a
r
g
ument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nied
e
r
a
dd-interactive
:
Clari
f
y “
r
e
m
aining hu
n
k
s
in
the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jon
a
than Nieder
grep: refactor grep_objects
l
oo
p
in
t
o its
o
w
n fun
c
t
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jon
a
than Nieder
Doc
u
menta
t
ion/che
c
kout: clarify descrip
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Niede
r
r
eb
a
se -i -p: document sho
r
tcoming
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jona
t
h
an
N
ied
e
r
D
W
IM
'
git show -5' to 'git show --do-walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonath
a
n Nie
d
er
gitignore
.
5: Cla
r
ify matching
rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jona
t
han
N
i
eder
rebase:
improve error message when upstre
a
m argum
e
nt
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonath
a
n Nied
e
r
Docum
e
n
t
atio
n
/c
h
e
c
kout: clari
f
y description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nieder
fsck: fi
x
b
o
gus
commit he
a
de
r
c
h
eck
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
J
on
a
than Nied
e
r
Add git remote set-branches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan
Nie
d
er
post-receive-e
m
a
i
l:
document c
o
mm
a
nd-line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
natha
n
Nieder
git
svn: avoid uninitialized
v
ar in
'
r
eset'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
Ni
e
de
r
Makefile:
l
et header dependency
ch
e
cker o
v
err
i
de COMPUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nie
d
e
r
Mak
e
file: fix he
a
d
er
d
ependency checke
r
to a
l
l
ow NO_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
a
n
N
ieder
Documen
t
a
t
ion
/
notes: nitp
i
cks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nied
e
r
Doc
u
mentatio
n
/
n
o
t
es: clean up de
s
cription of rewriting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
n
athan
N
iede
r
Documenta
t
ion/notes:
s
impli
f
y treatment of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nieder
Documentation/log
:
ad
d
a CONFIG
U
RA
T
ION
s
ection
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Ni
e
der
Documentation/notes:
s
impl
i
f
y
treat
m
ent
o
f defau
l
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
e
d
er
Documentation/notes
:
add con
f
iguration
s
ection
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
ede
r
D
o
cumentati
o
n/notes: describe
c
ontent of notes
blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nie
d
er
Documentation/notes: doc
u
ment
f
o
r
m
a
t of notes tree
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan
Nieder
cherry-pick: do not
dump core wh
e
n iconv
f
ails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonath
a
n
N
iede
r
p
retty: initialize n
e
w cmt_f
m
t_map to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
adapt request-pull t
e
s
ts for
new pul
l
reques
t
format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Nieder
t
est-lib
:
s
o
me shells d
o
not
let $? pr
o
p
agate
i
n
to
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
atha
n
Niede
r
shortl
o
g: Document and test --form
a
t option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
h
an Nied
e
r
t4201 (sh
o
r
t
log): Test output form
a
t
w
ith multiple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonatha
n
Nieder
t
4201
(shortlo
g
): guard
s
e
t
up with
t
e
st_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Niede
r
Documen
t
a
ti
o
n/s
h
ortlog: scripted users should not rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
on
a
than N
i
eder
commit --amend: cope with
missing display name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
N
ieder
test-lib: Let tests
s
pe
c
ify
commands to be run at
e
n
d
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
o
na
t
ha
n
Nieder
fsck:
check
i
den
t
lines in commit obje
c
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nie
d
er
re
q
uest-p
u
ll: protect a
g
ai
n
st OPTIONS_KEEPDASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan
Nieder
te
s
ts for
request-pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Nieder
Doc
u
mentation/Makefile: fix interrupted buil
d
s of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jona
t
han
Nieder
fix "bundle
--stdi
n
"
s
eg
f
ault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonatha
n
Nie
d
er
t5
7
04
(
bu
n
dle): add tes
t
s for b
u
ndle --stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonat
h
an
Nieder
tag -v
:
use RUN_GI
T
_CMD to run ver
i
fy-
t
a
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
onathan Nied
e
r
Document new
"
already-m
e
rged" ru
l
e
f
o
r branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonatha
n
N
i
eder
Add
.
depend
d
irectories to
.
gitignore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
onathan Nie
d
er
t7006: guard cle
a
nup with t
e
st_e
x
pect_su
c
c
ess
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jon
a
than Nieder
t
5800: testgi
t
helpe
r
requires Pyth
o
n support
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
J
o
n
a
than Nieder
t7400: cla
r
if
y
subm
o
dule update tes
t
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonatha
n
Nieder
t7400:
clar
i
fy 'submodule
a
dd' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan
N
ieder
t7400: spl
i
t set
u
p into multiple test
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonatha
n
Nieder
Teach mailinfo %< as an alternat
i
ve scissors mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
J
onathan Nieder
Ma
k
efil
e
: f
u
ture-
p
roof Cygwin
v
ersion check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
merg
e
-
recursive
:
a
d
d
a
labe
l
for
a
ncestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry-pick, r
e
vert: add a labe
l
for
a
n
c
e
stor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
a
tha
n
Nieder
revert
:
cl
a
rify label
o
n confl
i
ct hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compat: add mempc
p
y
(
)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
checkou
t
-m --conflict=d
i
ff3: add a label fo
r
ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nie
d
er
merge_trees():
add an
c
estor label
parameter for d
i
f
f3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
eder
merg
e
_file(
)
: add comment expla
i
n
i
ng
b
ehavior wrt conf
l
ict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
checkou
t
-
-
conflic
t
=diff3: add
a
l
a
bel for anc
e
stor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next