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 'ap/diff-ignore-blank-lines'
2013-06-18
Ke
v
in Bracey
D
o
cumen
t
ation:
Move "gi
t
d
iff <blob
>
<blob>
"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Brac
e
y
revisio
n
.
c
:
make
d
efault history consider bottom c
o
mmi
t
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Br
a
c
ey
revisio
n
.
c: don't show all merges for --p
a
rent
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Br
a
cey
revis
i
on
.
c
:
discoun
t
side branc
h
es
w
h
e
n
computing TREE
S
AME
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
Bracey
r
evi
s
ion
.
c
:
add BOTTOM flag for
comm
i
t
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
s
implify-
m
erges: d
r
op
m
erge from irrelevant side branch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kev
i
n Bracey
simpl
i
fy-merg
e
s: never remove
all TR
E
ESAM
E
parent
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
Br
a
cey
revision
.
c: Make --full
-
history consider
more mer
g
e
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
Documentation: avoid "unintere
s
ting"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Bra
c
ey
rev-lis
t
-opti
o
ns
.
txt: co
r
rect
T
REESAM
E
f
o
r
P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t6111:
a
d
d
p
a
ren
t
s to
t
e
sts
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t6111: new
TREES
A
ME test set
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
Bracey
t
6
0
1
9: t
e
st
file dropped in -s ours merge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin Bracey
decorate
.
c: compa
c
t
tab
l
e when growing
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kev
i
n
Bracey
re
v
isi
o
n
.
c: treat
A
.
.
.
B merge bases as i
f
manuall
y
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Bra
c
ey
t6
0
1
9
: demonstrate
-
-ancestry-path A
.
.
.
B breakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin B
r
a
cey
cher
r
y-pick/revert
:
make
u
sage
s
ay '<commit-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin
B
racey
checkout: abbr
e
viate hash in
su
g
gest_reattach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin B
r
acey
git-m
e
r
g
e-
o
ne-f
i
le: sen
d
"ERRO
R
:" me
s
sages to stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
K
evin
B
ra
c
e
y
git-merge-one-
f
i
l
e: style clea
n
up
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kev
i
n Bra
c
ey
mer
g
etools/p4
m
erge: create a base if none
available
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Ke
v
in Br
a
c
ey
mergetools
/
p4
m
erge: s
w
a
p
LOCAL
a
nd REMOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
K
e
vin Bracey
g
i
t
.
c: make usage match manua
l
page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin B
r
acey
Translate g
i
t
_
more_i
n
fo_s
t
ring consistently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree