repo.or.cz
/
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 'rh/merge-options-doc-fix' into maint
2013-05-16
Ke
v
i
n Bracey
revision
.
c: treat A
.
.
.
B me
r
ge
b
a
ses as if manually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Bracey
t6019: demonstrate --ancestr
y
-pa
t
h
A
.
.
.
B breakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Ke
v
in Bracey
ch
e
rry-pick/rev
e
rt: make usage say '<c
o
mmit-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin Brac
e
y
ch
e
c
kout: abbre
v
iat
e
hash
i
n
suggest_reattach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Ke
v
in Bracey
git-merge-one-file: s
e
nd "ERROR:" mess
a
ges to st
d
err
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
git
-
merge-one-file:
s
tyle
clean
u
p
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
me
r
g
e
t
ools/p4merge: cr
e
a
te a
base if none avai
l
able
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
m
er
g
e
t
ools/p4merge:
swap LOC
A
L and REMOT
E
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Kevin Bracey
git
.
c: make usag
e
match manual page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin
B
rac
e
y
Tran
s
lat
e
git_more_inf
o
_
s
tring
c
onsistently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree