repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'tr/line-log'
2013-05-16
Kevin Bra
c
ey
revision
.
c: treat A
.
.
.
B merge base
s
as if m
a
nually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Bracey
t6019: demonstrate --ancest
r
y-pat
h
A
.
.
.
B
b
reakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevi
n
Bracey
cher
r
y-pick/revert: make us
a
ge say
'<
c
ommit-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin B
r
acey
checkout: abb
r
eviate hash in
s
uggest_reatta
c
h
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bra
c
ey
g
it-merge-one-file:
send "ERROR:" messag
e
s
t
o std
e
rr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin B
r
ace
y
gi
t
-merge-one-
f
ile: styl
e
cleanu
p
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevi
n
Brac
e
y
merge
t
ools/
p
4merge: create a base
if n
o
n
e
ava
i
lable
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kev
i
n
Bra
c
ey
mergetools/p
4
merge
:
swap LOCAL a
n
d RE
M
O
TE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Ke
v
i
n
Bracey
g
i
t
.
c: ma
k
e usage match manual page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kev
i
n Bracey
Transla
t
e
g
it_more_info_st
r
ing consistentl
y
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree