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 'tg/maint-zsh-svn-remote-prompt'
2013-05-16
Kevin Bracey
revision
.
c: treat A
.
.
.
B
merge
b
a
s
es as if
manually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Ke
v
i
n
Brac
e
y
t6019:
de
m
onstr
a
te --ancestry-pat
h
A
.
.
.
B breakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevi
n
Brac
e
y
c
her
r
y-pick/rever
t
: make usage say '
<
commit-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin
Brac
e
y
checkout: abbrev
i
ate hash in suggest_reattach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
git
-
mer
g
e-one-
f
i
le: send "ERROR:" messages to stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
g
it-
m
erg
e
-one-
f
ile: styl
e
cleanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Brace
y
mergetools/p4m
e
rge: creat
e
a
ba
s
e if
n
one availab
l
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin
Bracey
mer
g
et
o
ols/p4merge
:
swap
L
OCAL and R
E
MOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Kevin
B
r
a
c
ey
git
.
c:
m
ake usage match m
a
nual page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
K
e
v
in B
r
a
c
e
y
Tra
n
slat
e
git_more_info_string consistently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree