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 'jc/triangle-push-fixup'
2013-06-27
Kevin B
r
acey
am: rep
l
ace uses
o
f
--resolved with --conti
n
ue
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
Kevin Bra
c
ey
Documentation: Move "git
d
iff <blob> <blob>"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
r
e
visio
n
.
c: make default his
t
ory consider bottom commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
Brace
y
revi
s
ion
.
c: don'
t
show all merges for --parents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
v
i
n Bracey
r
ev
i
sio
n
.
c
:
d
iscount side branc
h
es when computing TREESAME
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
B
r
acey
r
ev
i
sion
.
c: a
d
d BOTTOM
f
lag fo
r
commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brac
e
y
simplify-m
e
rge
s
: drop merge from irrelevant si
d
e branch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
Bracey
sim
p
lify-me
r
g
e
s:
n
ever remove all TREE
S
AME parents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
rev
i
sion
.
c:
Make --full-histo
r
y
c
onsider more merges
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
Do
c
umentation: avoid "uninteresting"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kev
i
n Bracey
r
ev-
l
ist-options
.
txt:
c
orr
e
ct TREESA
M
E
for P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t
6
111: add parent
s
to tests
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
Br
a
cey
t6111: new TRE
E
SAME test set
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t
6
019:
t
est file dropped in -
s
ours merge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
v
in Brace
y
dec
o
rate
.
c: co
m
p
act table when growin
g
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin
B
race
y
revision
.
c
: t
r
ea
t
A
.
.
.
B merge
b
ases as
if
manually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
K
e
vin
Bracey
t
6
019: demonstrate --ancestry-path
A
.
.
.
B breakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin
B
racey
cherry-pick
/
revert: make usage say '<comm
i
t-ish
>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin
B
racey
checkout:
abbrev
i
a
t
e hash
i
n suggest_
r
eatta
c
h
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
K
e
vin Bracey
git-merge-one-
f
i
le: se
n
d
"
ERRO
R
:
"
m
e
s
sages
t
o stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
git-merge-
o
ne-file: style c
l
eanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevi
n
Bracey
m
e
rgetools/p4me
r
ge: cr
e
a
t
e a bas
e
if no
n
e available
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Ke
v
i
n
Brac
e
y
me
r
getools/p4merge: sw
a
p
LO
C
AL and REMOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Kevin Bra
c
ey
git
.
c: make usage match manual
pa
g
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kev
i
n Bracey
T
ra
n
slate git_
m
o
r
e_in
f
o
_
stri
n
g
c
on
s
istently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree