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 'hv/config-from-blob'
2013-06-27
Kev
i
n
Bracey
am: repla
c
e
u
ses of --resolved with
-
-conti
n
ue
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
K
evin
Bracey
Documenta
t
i
o
n
: Move "g
i
t diff <b
l
o
b
> <blob>"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
revision
.
c
:
m
a
ke defa
u
lt
histo
r
y
consider b
o
ttom commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin Bracey
revisi
o
n
.
c
: don't show al
l
m
e
r
g
es for --
p
aren
t
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
r
evi
s
i
on
.
c: discount side branches
when computing TREESAME
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brace
y
r
evision
.
c: add BO
T
TOM fl
a
g f
o
r
commit
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
Bracey
simplify-merges: drop m
e
r
g
e from
irrelevant side branc
h
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brace
y
simplify-merges: never re
m
ove
a
l
l
TR
E
ESAME par
e
nt
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Br
a
cey
rev
i
s
i
on
.
c:
Mak
e
--full-history co
n
sider more m
e
rg
e
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin Bracey
Documentation: a
v
oid "uninteresti
n
g"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
rev-list-opt
i
ons
.
txt: correct TREESAME for P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t6111
:
a
d
d parents to tests
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
ev
i
n Bracey
t
611
1
: new TREESAME te
s
t
s
et
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bra
c
ey
t6019: tes
t
f
ile dropp
e
d i
n
-s ou
r
s merge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
Bracey
decorate
.
c: compac
t
table w
h
e
n
growing
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin B
r
acey
revision
.
c: trea
t
A
.
.
.
B m
e
rge bases as
i
f ma
n
ually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin B
r
acey
t601
9
: demonstrate --ancestr
y
-path A
.
.
.
B br
e
akage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevi
n
Bracey
ch
e
r
r
y-pi
c
k/revert: make us
a
ge say '<commit-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin
B
racey
che
c
kout
:
abbrev
i
ate has
h
in su
g
gest_r
e
a
ttach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
K
evin Bra
c
ey
gi
t
-merge-
o
ne
-
file
:
send
"ERROR
:
" messages to
stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
K
evin Bracey
git
-
m
erge-
o
ne-file:
s
tyle cleanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
mergetools
/
p4merge: cr
e
a
te
a
base if
none available
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bra
c
ey
mergetools
/
p4
m
e
r
ge:
s
wap LOCAL and RE
M
OTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Kevin Bracey
g
i
t
.
c
: make
u
sage match manual
p
a
g
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
K
e
vin Bracey
Tr
a
n
slate
g
it_m
o
re_info_string
consisten
t
l
y
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree