repo.or.cz
/
alt-git.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/test-v-and-v-subtest-only'
2013-06-27
Ke
v
in Br
a
c
ey
am: replace
us
e
s of --resolve
d
with --co
n
t
i
n
ue
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
Kevin B
r
acey
Documentation: Move "git diff
<blob> <blob>"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Br
a
cey
revision
.
c: make default history consider bott
o
m commit
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
revision
.
c: don't
s
how all merges for --parents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
Bracey
rev
i
sion
.
c: discou
n
t sid
e
br
a
n
c
h
es
when computi
n
g
T
RE
E
SAME
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
revi
s
ion
.
c:
add BOTTOM flag
for commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
simplif
y
-merges:
drop merg
e
from irreleva
n
t side bra
n
ch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brace
y
simplify-m
e
rges: never rem
o
ve all TREESAME parent
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
revision
.
c: Make --full-his
t
o
ry consider
m
ore merges
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
v
i
n
B
r
acey
Documentation: avoid "uni
n
teresting"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Bracey
rev
-
list-
o
pt
i
on
s
.
txt: co
r
r
e
c
t
TREESAME for P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brace
y
t
6
111: add parents
to
tests
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Bracey
t6111: new TREESAME test set
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
Brac
e
y
t6019: test file dropped in
-
s ours m
e
rge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brac
e
y
dec
o
rat
e
.
c: compact ta
b
le when growin
g
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kev
i
n Bra
c
ey
revision
.
c
:
treat A
.
.
.
B merge bases as if m
a
n
u
ally
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
K
evi
n
Bracey
t6
0
19:
d
emo
n
strate --
a
ncestr
y
-path A
.
.
.
B b
r
eakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin Bracey
c
herry-p
i
ck/rever
t
: make us
a
ge say '<co
m
mit
-
ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
K
e
v
in Bracey
checkout: abbrev
i
ate ha
s
h
in
s
uggest_reattach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
git-m
e
rge-one-file: send "ERROR:" messages to stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
K
e
vin Bracey
g
i
t
-
me
r
ge-one-fi
l
e: st
y
le
cleanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin B
r
a
c
ey
mergetools/p4merge: cr
e
ate
a
base if none ava
i
lable
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
mergetools/p4merg
e
: swap L
O
CAL and REMO
T
E
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Kevin Bracey
git
.
c: m
a
ke u
s
age match m
a
nua
l
page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin
Bracey
Translate git_mor
e
_inf
o
_s
t
ring consistently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree