repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'rj/mingw-compat-st-mode-bits' into next
2013-05-16
Kevin Bracey
revision
.
c: treat A
.
.
.
B merge bases as if
m
anually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Bracey
t6019: demonst
r
at
e
--ancestry-p
a
th A
.
.
.
B breakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
K
evin
Bracey
c
h
er
r
y
-
p
i
ck/revert: m
a
ke
usage say '<comm
i
t-ish
>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin
B
racey
checkout: abbr
e
via
t
e hash in suggest_reattach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
K
e
vin Brace
y
git-merg
e
-one-
f
i
l
e
:
send "ERROR:" messages to
s
tderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
K
evin Bracey
git-me
r
ge
-
on
e
-file:
s
t
yle cleanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
mer
g
e
tools/p4merge: create a base if none available
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
merg
e
t
o
ols
/
p4
m
erge: sw
a
p LO
C
AL and
REMOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Ke
v
in Brac
e
y
git
.
c:
m
ak
e
u
sage m
a
t
c
h
manual
p
age
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin Bracey
Translat
e
g
i
t_more_info_string consistently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree