repo.or.cz
/
tgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2010-07-08
Jonath
a
n Nieder
t9118 (git-svn
)
: pr
e
vent e
a
rl
y
failur
e
fr
o
m
taking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jo
n
athan Nieder
t/RE
A
DM
E
:
d
ocume
n
t more test
h
elpers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
J
o
nathan Nieder
revert: do not rebu
i
l
d ar
g
v on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
t
3
508 (che
r
ry-pick)
:
f
u
t
ureproof against unmerged
f
il
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jona
t
han Nieder
g
i
t
-svn: strip
o
ff leading sl
a
s
h
es on --tru
n
k arg
u
ment
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan N
i
eder
add-
i
nteractive: Clar
i
fy “remaining hunks i
n
t
he file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
grep: refactor gre
p
_obje
c
t
s l
o
op i
n
to its own
functio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
J
o
nathan Ni
e
d
e
r
Documentation/chec
k
out: clarify descriptio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
J
o
nath
a
n
Nieder
rebase -i -p:
d
ocument sh
o
rtcom
i
ngs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonath
a
n Nieder
DWIM 'git show
-
5' to '
g
it
s
ho
w
--do-walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonath
a
n Nieder
gitignore
.
5: C
l
arif
y
matc
h
ing rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan
N
ieder
rebase
:
im
p
ro
v
e error message
whe
n
up
s
t
r
eam
argument
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
D
o
c
umentation/checkou
t
: clarify des
c
ription
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jona
t
han Nieder
fsck: fix b
o
gus c
o
m
m
i
t
he
a
d
er che
c
k
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
Add git rem
o
te
s
et-branch
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
p
os
t
-receive-
e
mail:
d
ocume
n
t command-li
n
e mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
git
svn: avoid u
n
i
n
iti
a
lized v
a
r in 'reset'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
M
a
kefi
l
e: let
h
eader dependen
c
y chec
k
er override COMPUTE_H
E
A
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Mak
e
file: fix
h
eader dependency ch
e
cker to a
l
low
N
O_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Nie
d
er
Docume
n
tation/not
e
s: nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than Nieder
Documentat
i
on/notes:
c
l
ean u
p
description of r
e
w
r
iting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
iede
r
Documentati
o
n
/notes:
simplify
treatment of defa
u
l
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Doc
u
men
t
ation/
l
og: add
a CONFIGURAT
I
O
N section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
n
a
th
a
n Ni
e
der
Documentation/n
o
tes: simpl
i
fy treatment of
default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
a
n Niede
r
D
o
cumentation
/
not
e
s: add
c
onfiguration section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nieder
Documentatio
n
/not
e
s: describe conten
t
of n
o
t
e
s bl
o
b
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nat
h
a
n
N
iede
r
Docu
m
entation/notes:
d
ocument
format
o
f not
e
s tre
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonat
h
an Nieder
cherry-pick: do not du
m
p core when ic
o
nv fail
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jo
n
athan Nieder
pretty:
init
i
alize n
e
w cmt_
f
m
t
_ma
p
t
o
0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
adapt request-pull test
s
for new
pull reque
s
t format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan N
i
eder
test-lib: som
e
shells do not let $? prop
a
gate
i
nto
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han
Niede
r
sh
o
r
t
log: Doc
u
ment and tes
t
--format option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nied
e
r
t
4
201 (sh
o
rt
l
og): Test output format with mult
i
p
l
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
N
ied
e
r
t
4
201
(
shortlog): guard
setup with test_ex
p
ect_succ
e
ss
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nied
e
r
Docum
e
ntation
/
s
h
ortlog: script
e
d users sho
u
ld n
o
t rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan Nieder
commit --amend: cope with missing di
s
play na
m
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
test-lib: Le
t
tests
s
pecify c
o
mmands to be
run at
e
nd
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonath
a
n Nieder
fsck: c
h
eck ident lin
e
s in commit objec
t
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Ni
e
d
e
r
re
q
uest-
p
ull:
protect against OPTIONS_
K
E
E
PDASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
o
na
t
han Nieder
tests for
r
equest-
p
ull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonatha
n
Nieder
Documentation/Makefile: fix in
t
er
r
upted
b
ui
l
d
s
of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
fix
"bundle --stdi
n
" se
g
fault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
t5704 (bundle): add
t
ests for bundle --stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Nieder
tag -v: use RU
N
_GI
T
_CMD
t
o r
u
n v
e
rify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan
N
ieder
Document new "already-merged"
r
ule for
branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonath
a
n
Nieder
Add
.
d
epend directori
e
s to
.
gitignore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
t
70
0
6
:
guard clea
n
up with t
e
s
t
_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan
N
ieder
t5800
:
t
e
stgit hel
p
er r
e
q
u
ir
e
s
Python support
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonat
h
an Nieder
t7400: clarify submodule update tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jon
a
than Nieder
t7
4
00
:
clarif
y
'
s
ubmod
u
le add
'
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Niede
r
t7400: split setup into multiple
t
e
st
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
J
on
a
than Nieder
T
each mail
i
nfo %<
a
s an alternative sc
i
ssors m
a
r
k
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
J
onathan
Nieder
Ma
k
e
f
i
le: fu
t
ure-
p
roof C
y
g
w
i
n ver
s
i
o
n check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onat
h
an Nieder
m
e
rge-rec
u
rsive:
a
dd a l
a
bel for
a
ncesto
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han
Nie
d
er
cherry-pick,
r
e
v
ert
:
add a label fo
r
a
n
ces
t
or
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
revert: clari
f
y label on
c
o
n
flict hunk
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compat: a
d
d mem
p
c
p
y()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout -m --
c
onflict=diff3: add a la
b
el for ance
s
tor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nied
e
r
merge_trees(): add
ancestor label para
m
eter for dif
f
3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
mer
g
e_file(): add comment
e
xplainin
g
behavior wrt conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout --c
o
nflict=diff3: add a la
b
el f
o
r anc
e
stor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
l
l
_
m
e
rge():
add ancestor
lab
e
l par
a
meter for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
m
e
rge-f
i
le --diff3:
a
dd
a
label for ances
t
or
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Ni
e
der
xdl_me
r
ge(): move fil
e
1 and fi
l
e
2
labe
l
s to xmparam
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
N
ieder
x
dl_mer
g
e():
a
dd o
p
tional ance
s
tor labe
l
to diff3-sty
l
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: document cher
r
y-pick behavior in fa
c
e
of conflic
t
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
te
s
ts:
document format of conflicts
f
ro
m
chec
k
out
-
m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
revert: fix tiny memo
r
y leak in
che
r
ry-p
i
ck
-
-ff
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nat
h
a
n
Nieder
Makefil
e
: Fix occasional GIT-CFLAGS brea
k
age
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
eder
Make
f
ile: Fix
CDPATH problem
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jona
t
h
an
N
i
eder
gitk: Don't
c
lobber "Remembe
r
thi
s
view" setting
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
athan Ni
e
der
gitk: Add co
m
ments to explain encod
e
_view_opts
a
n
d
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
Jona
t
han
N
ieder
M
a
k
efile: clar
i
fy d
e
finition o
f
TEST_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan Nieder
am: remove rebase-ap
p
ly dire
c
tory b
e
f
o
re
g
c
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Nieder
tests: Fix race c
o
nd
i
t
i
on in t
7
006-pag
e
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan Nieder
t
7006-pager: i
f
stdou
t
is not
a
t
e
rminal, make a new on
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
Jonath
a
n
N
ieder
tests:
A
dd test
s
fo
r
auto
m
a
tic use of p
a
ger
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jo
n
atha
n
Nieder
am: Fix
launchin
g
of
p
ager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jo
n
at
h
a
n
N
iede
r
git svn: Fix
launchi
n
g of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
J
o
n
a
than N
i
eder
git
.
1: Clarify the be
h
av
i
or of
t
he -
-
paginate option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jo
n
athan
Nied
e
r
M
a
k
e 'git
var GIT_PAG
E
R' always print the configur
e
d
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
J
onath
a
n Nie
d
er
Fix 'git var' u
s
a
ge
synopsis
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
J
o
n
athan Nieder
M
a
k
e
file: alw
a
ys r
e
move
.
depe
n
d directories on 'ma
k
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan
Nie
d
er
M
a
kefile:
t
uck
a
w
ay generated make
f
ile
fragments in
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonatha
n
Nieder
D
o
n
o
t i
n
st
a
ll
she
l
l
libraries executable
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
J
onath
a
n Nieder
Te
a
ch Makefile to c
h
eck header
dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
J
ona
t
han Nieder
Makefile: list standalon
e
pro
g
ram object files
i
n PROGRAM_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nied
e
r
Makefile: lazi
l
y
compute head
e
r dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
a
than N
i
e
d
er
Mak
e
file:
l
ist genera
t
ed ob
j
e
ct file
s
in OB
J
ECTS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
an Nieder
Makefile: disable defau
l
t implicit rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Mak
e
file:
r
earrange dep
e
n
dency rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
onathan Nieder
Makefile
:
t
r
ansport
.
o depends o
n
branch
.
h n
o
w
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
o
natha
n
Nie
d
er
Merge b
r
anch 'master' of git://rep
o
.
or
.
c
z/alt-git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
an
Nieder
Make
f
ile:
d
rop depe
n
d
e
ncy on $(wildcard */*
.
h)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Ni
e
der
Make
f
ile: cle
a
n up http-walker
.
o de
p
endenc
y
rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
athan Nied
e
r
Ma
k
efile:
r
emove wt-status
.
h
fr
o
m L
I
B_H
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
onath
a
n
N
ie
d
er
Makefile:
make
sure test helpers are
rebui
l
t when head
e
rs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Ni
e
der
M
a
kef
i
l
e
:
add missin
g
header file dependenci
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Doc
u
me
n
tation:
m
erge: u
s
e
MERGE_HEAD to refe
r
to
t
he
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nie
d
er
Document
a
ti
o
n: si
m
plif
y
How Merge Works
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next