repo.or.cz
/
git
/
jrn.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/push-no-verify-doc'
2013-05-16
Kevin Bracey
rev
i
sion
.
c: treat A
.
.
.
B
mer
g
e bases as
if manual
l
y
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
K
evin Bracey
t6019: de
m
on
s
trate --ancestry
-
path A
.
.
.
B
brea
k
a
g
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin Bracey
c
her
r
y
-
pick/reve
r
t: m
a
k
e usage sa
y
'<
c
ommit-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin Brac
e
y
chec
k
o
u
t
: abbr
e
viate hash in suggest_reatt
a
ch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevi
n
Bracey
git-merge-one-file: send "ERRO
R
:"
mess
a
ges to stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
K
e
vin Bra
c
ey
g
it-merge-one-file: style cleanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
m
e
r
getools/p4merge
:
crea
t
e a base if none avail
a
ble
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
merg
e
t
o
ols
/
p
4merg
e
: sw
a
p LOCAL
a
nd R
E
MOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Kevin Bracey
git
.
c:
make
u
s
age mat
c
h manua
l
p
age
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
K
e
vin Bracey
T
r
ansla
t
e git_mor
e
_info_string
c
onsistently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree