repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: merge: add an overview
2010-01-24
Jon
a
than
N
ieder
Documentati
o
n
:
merge:
a
dd an ov
e
rview
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Docu
m
en
t
ation: merge: move merge str
a
t
e
gy list
to end
Suggested-by: Thomas Rast <
trast@student.ethz.ch
>
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-24
Jon
a
than Nieder
Docu
m
en
t
at
i
on: sug
g
e
s
t
`rese
t
--
m
erge
`
in How M
e
rge
.
.
.
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documentation
:
merge: move co
n
figurati
o
n sec
t
ion
to
e
nd
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-10
Thomas Rast
Document
a
tion:
e
mp
h
asise
'
git sh
o
rt
l
og' in its s
y
nopsis
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-10
Thomas
R
ast
Documentation: show-
f
i
les is now c
a
lled git-ls-
f
iles
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-10
J
onathan Nieder
Documenta
t
ion: tiny git
c
o
nf
i
g manual tweaks
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nieder
Documentati
o
n: git gc packs refs by
d
efault now
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-10
Thom
a
s Rast
Do
c
umentati
o
n: spell 'git cmd' wi
t
hou
t
dash throug
h
out
commit
|
commitdiff
|
tree
2010-01-10
Thom
a
s Rast
Documentation
:
format full com
m
a
n
ds in typew
r
it
e
r font
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-09
Thomas Ra
s
t
Documentat
i
o
n: warn prom
i
nently against m
e
rging with
.
.
.
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-09
Thomas R
a
st
D
o
c
u
mentation/git-mer
g
e: rewo
r
d
r
eference
s
to "remote
.
.
.
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
