repo.or.cz
/
git
/
srabbelier.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-trees: push choice to renormalize away from low level
2010-08-06
Jonathan Nieder
merge-trees: push
ch
o
ice to r
e
n
ormalize away from low
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan Nieder
t
6
038 (m
e
rge
.
renormal
i
ze): chec
k
that
it
ca
n
b
e
tur
n
ed of
f
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nath
a
n
N
ieder
t6038 (merge
.
re
n
ormalize): try
che
c
kout -m and cherry
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
than Ni
e
der
t
6
038 (merge
.
r
e
normalize): style nitpic
k
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonat
h
a
n
Nieder
g
i
t-sv
n
:
strip off leading slashe
s
o
n
--
t
runk argument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan N
i
ed
e
r
add
-
interactive: Clar
i
f
y “re
m
aining hunks in the file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan
Nieder
Documenta
t
ion/checko
u
t
: c
l
arif
y
description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
J
ona
t
han Ni
e
der
re
b
ase -i -p:
d
ocument shor
t
c
omings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan Ni
e
der
DWIM 'git show -5' to
'git show
-
-do-walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jo
n
atha
n
Nieder
gi
t
ignore
.
5: Clarify
matching r
u
les
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
J
o
nat
h
an
N
ie
d
e
r
rebase
:
impr
o
ve error message when up
s
t
ream argume
n
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan
N
ied
e
r
Document
a
t
i
o
n
/ch
e
ckout: clar
i
fy description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jona
t
han Nieder
fsck:
f
i
x bogus
c
ommit header check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan
Nied
e
r
A
dd git r
e
mote set-br
a
nches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jona
t
han N
i
eder
post-re
c
eive-email
:
document
co
m
mand
-
line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an Nieder
git sv
n
: avoid u
n
ini
t
ializ
e
d
v
a
r
in 'r
e
set'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
eder
Makefile:
le
t
hea
d
er depen
d
ency c
h
ecker override COMPUT
E
_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Ma
k
efile: fix header dep
e
ndency checker t
o
al
l
ow N
O
_CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n
N
ieder
Documentation/not
e
s
: ni
t
pic
k
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nieder
Documentation/note
s
: clea
n
u
p
description of r
e
writing
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
D
ocu
m
e
n
tation/no
t
es: si
m
plify
treatment of
d
e
fa
u
lt
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than
Ni
e
der
Documen
t
ation/log
:
add a
C
O
N
FIGUR
A
TION section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ieder
Documen
t
at
i
on
/
note
s
: sim
p
lify
t
reatment
o
f
d
efault
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
on
a
t
h
an Nied
e
r
Docu
m
entation/note
s
: add con
f
i
g
u
ration sect
i
on
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
h
an Nieder
Documenta
t
i
o
n/
n
ote
s
: describe con
t
ent of no
t
es blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Ni
e
der
Documentation/note
s
:
d
ocum
e
nt format of notes
tr
e
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
cher
r
y-pic
k
: do not dum
p
core w
h
en iconv fa
i
ls
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
pretty: in
i
tialize new cmt_fmt
_
map to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Ni
e
d
e
r
a
dapt request-pull t
e
sts
f
or
n
e
w pull requ
e
st format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Ni
e
der
test
-
lib: som
e
shel
l
s do not let $? propagate in
t
o
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han Ni
e
der
shortlog: D
o
cu
m
en
t
and test -
-
format option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
an Ni
e
der
t
4
201 (shortlog
)
: Test output for
m
at with
mu
l
tiple
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
ha
n
N
i
eder
t4201 (short
l
og): guard setup with
t
es
t
_expe
c
t_succ
e
s
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
Ni
e
der
Do
c
umentation/shortlog: scr
i
pted user
s
should not rely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonath
a
n Niede
r
commit --amend: cope wi
t
h missi
n
g display name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
N
ieder
t
est-li
b
: Let te
s
t
s specify commands to be run at end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan N
i
eder
fsck
:
check
ident
lines in
com
m
it objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
r
equest-
p
ull:
protec
t
against
O
PTIONS_K
E
EPDAS
H
DASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
onathan Nied
e
r
t
e
sts for request-
p
u
l
l
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonatha
n
N
i
ede
r
D
o
cumen
t
ation
/
Make
f
ile: fix interrupte
d
buil
d
s of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
fix "bu
n
dle --stdi
n
" segfault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
J
o
n
athan Nieder
t
5704 (bundle): a
d
d tes
t
s for bundl
e
--stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonathan Niede
r
tag -v: use RUN_GIT_CMD to run verify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jon
a
than Nieder
Document new "already-merged" rule fo
r
b
r
anch -
d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonath
a
n Nieder
Ad
d
.
depend directorie
s
to
.
gi
t
ig
n
ore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
t
7
006: guard c
l
eanup with test_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonat
h
an N
i
eder
t5800: testgit helper req
u
i
r
es Python
su
p
por
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonat
h
a
n Nieder
t740
0
: clari
f
y
submodule upd
a
te te
s
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jon
a
than Ni
e
der
t7400:
c
la
r
ify
'
submodule add' t
e
sts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Ni
e
der
t7
4
00: split setup into multip
l
e tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
J
o
na
t
han N
i
eder
Teac
h
ma
i
linfo %< as an
a
l
t
erna
t
ive scissors
m
ark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
M
ak
e
file: future-proof Cygwin vers
i
o
n ch
e
ck
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nied
e
r
merge-re
c
ursive: add
a label f
o
r ancesto
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
cherry-pick, re
v
e
rt: ad
d
a labe
l
for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an
Nieder
revert:
c
larify label on
c
onflict
h
unks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compat: add mempcpy
(
)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
c
h
eckout -m --conflict=diff3
:
a
dd
a
l
abel for
ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
me
r
g
e
_
trees(): a
d
d ancestor label parame
t
er for
d
iff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
merge_file(): add commen
t
explaini
n
g beha
v
ior
wrt conflict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
c
h
eckout --confl
i
ct=diff3: add
a label for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
i
eder
ll_merge():
a
dd
ancestor label parame
t
er for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nie
d
e
r
merge-file --di
f
f3: add a l
a
bel for a
n
ce
s
tor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
N
i
ede
r
xdl_
m
erge(): move file1
and file2 labels to xmparam
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
xdl_merge(
)
: add
opt
i
onal anc
e
stor label to diff3-style
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
tests:
do
c
ument c
h
err
y
-pick be
h
avior in
f
ac
e
of
c
onfl
i
cts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
test
s
: documen
t
format o
f
co
n
flicts from ch
e
c
kout -m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nat
h
an Nieder
revert:
f
ix t
i
ny m
e
mory leak in cherry-
p
ick -
-
f
f
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jon
a
tha
n
Nieder
Makef
i
le: Fix occasional GIT-CF
L
A
G
S b
r
eaka
g
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Ma
k
efi
l
e
: Fix CDP
A
TH
problem
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
N
ie
d
er
g
i
t
k
:
Don't clobb
e
r
"Remember t
h
is v
i
ew"
se
t
t
i
ng
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonatha
n
Nieder
gitk
:
A
d
d comments
to explain encode_
v
iew_opts
a
nd
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
J
o
nathan
N
i
eder
M
a
k
ef
i
le: c
l
arif
y
defin
i
tion of TEST_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan N
i
ed
e
r
am: remove rebase-a
p
p
ly directory
befo
r
e gc
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
Jonath
a
n Nie
d
er
tests:
F
ix race condition in t70
0
6-pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-21
Jonath
a
n Nied
e
r
t7006-pager: if stdo
u
t is not a terminal
,
m
ake a new one
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
J
onathan Nie
d
er
tests: Add tes
t
s
f
o
r automat
i
c
u
se of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonatha
n
Niede
r
am: Fix la
u
nching of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonath
a
n Ni
e
der
git svn:
F
ix la
u
nching o
f
pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonath
a
n Ni
e
d
e
r
gi
t
.
1
:
C
larify th
e
behavior of
the -
-
pag
i
nate optio
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jona
t
han
Nieder
Make 'g
i
t v
a
r GIT_PAGER' al
w
a
ys
p
rint
t
he configured
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Ni
e
der
F
i
x
'git v
a
r' usage
synop
s
is
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan N
i
eder
M
a
kefile
:
al
w
ays re
m
ove
.
depen
d
directo
r
ies on '
m
ake
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
J
o
nat
h
an N
i
e
d
er
Makefile: tuc
k
away generated makefi
l
e
f
ragments in
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Nieder
D
o not install shell libr
a
r
ie
s
executable
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan Nied
e
r
Teach
M
a
kefile to check header dependencie
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
J
o
nathan
N
ieder
Makefile: list st
a
ndal
o
ne progra
m
obje
c
t
file
s
in PROGRAM_OBJ
S
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jona
t
ha
n
N
ie
d
er
Makefi
l
e: lazily
c
ompute header
depe
n
dencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nie
d
e
r
Makefi
l
e: list generated ob
j
e
ct files in
O
BJ
E
CTS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
Nieder
Makefile:
d
isable default i
m
p
l
icit rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jona
t
han
Nied
e
r
Makefile:
r
earran
g
e de
p
enden
c
y rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
J
o
nathan Nieder
Makefile: tr
a
nsport
.
o depen
d
s o
n
branch
.
h
now
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jona
t
ha
n
Niede
r
M
erge branch 'maste
r
' of g
i
t:/
/
repo
.
or
.
cz/alt-git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
an Niede
r
Makefile: drop dependen
c
y on
$(wildcard */*
.
h)
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonath
a
n Nied
e
r
Makefile: clean
up
h
ttp-w
a
l
k
e
r
.
o dependency ru
l
es
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
a
than
N
i
eder
Makefile: remove
wt
-
stat
u
s
.
h fr
o
m
LIB_H
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
M
a
kefile
:
make sure test helpers
a
re reb
u
i
lt
whe
n
he
a
d
ers
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jonath
a
n
N
ieder
M
akefile:
add missing he
a
der file dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonath
a
n Nieder
D
o
cumentat
i
on: merge: use MERGE_HEA
D
to refer
to the
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Niede
r
Documentation: simplify How Me
r
ge Works
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan
N
ieder
Documentation:
merge: add a sec
t
i
on
a
bout fast-forw
a
rd
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next