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 a section about fast-forward
2010-01-24
J
o
nathan Nie
d
er
Docum
e
ntation: merge: add
a section abou
t
fast-forward
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Docu
m
e
n
tatio
n
:
e
mp
h
asize
w
hen git
me
r
ge termi
n
a
tes
.
.
.
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-24
Jo
n
a
than Nieder
Doc
u
mentation: mer
g
e: add an
overview
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-24
Jonath
a
n Nieder
Documentation: merge: m
o
v
e
merg
e
st
r
ateg
y
list
t
o end
Suggested-by: Thomas Rast <
trast@student.ethz.ch
>
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
natha
n
Nieder
D
ocumentation: suggest `reset
-
-merg
e
` i
n
Ho
w
Merg
e
.
.
.
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan
N
iede
r
Documenta
t
ion: merge: move
c
o
nfigu
r
a
tion
sectio
n
to end
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-10
Tho
m
as Rast
Docu
m
entation: emp
h
asise 'git s
h
ort
l
og' in its
s
ynop
s
i
s
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-10
Th
o
mas Rast
Documentation:
show
-
files is now ca
l
led git-ls-
f
iles
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-10
Jona
t
han
N
ieder
Doc
u
me
n
tation: ti
n
y g
i
t config m
a
n
ual tweaks
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nied
e
r
D
o
cumen
t
ation: git
g
c packs refs by default now
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-10
Th
o
mas
Rast
Documentation:
spell
'gi
t
cmd'
w
ithout dash throu
g
ho
u
t
commit
|
commitdiff
|
tree
2010-01-10
T
h
o
m
as Rast
Documentation:
format full
c
o
m
mands
in typewriter fon
t
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-09
Thomas Rast
Documen
t
ation
:
warn prominently
a
gai
n
st
m
erging with
.
.
.
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
2010-01-09
Thomas Rast
Docu
m
entation/git-merge: re
w
ord
r
eferences
t
o "remote
.
.
.
Signed-off-by: Thomas Rast <
trast@student.ethz.ch
>
commit
|
commitdiff
|
tree
