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 'ks/difftool-dir-diff-copy-fix' into maint
2013-05-16
Kevin Br
a
cey
re
v
ision
.
c: treat A
.
.
.
B m
e
rge ba
s
es as if m
a
nu
a
ll
y
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Bracey
t6019: dem
o
n
s
t
rate --anc
e
s
t
ry-path A
.
.
.
B breakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin Bracey
cher
r
y-pick/revert: make us
a
g
e say
'<c
o
mmi
t
-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin Brace
y
checkou
t
:
a
bbreviate hash in sug
g
e
s
t_
r
eattach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Ke
v
in Bracey
g
it-merge-one-file: sen
d
"ERROR:
"
mes
s
ages to stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Ke
v
in Bracey
g
i
t-mer
g
e-one
-
f
i
le:
s
tyle cleanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Ke
v
in Brace
y
m
er
g
e
t
ools/p4merge
:
c
reate a base if none
a
vailable
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
K
e
v
i
n B
r
a
cey
mergetools/p4merge:
s
wap L
O
CAL and REMOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Kevin
Bracey
git
.
c
: make usa
g
e match manual page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin
B
r
a
cey
T
ransla
t
e
gi
t
_more_info_
s
tri
n
g
consi
s
tently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree