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
.mailmap: update long-lost friends with multiple defunct addresses
2013-06-27
Kevi
n
Bracey
am:
replace use
s
o
f --re
s
olved
w
it
h
--contin
u
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
Kevin Br
a
c
e
y
Docume
n
tat
i
on: Move
"
g
i
t di
f
f <blob
>
<blo
b
>"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin
B
racey
re
v
i
s
io
n
.
c: make default
h
istory co
n
sider bottom commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
B
racey
revision
.
c:
don't show a
l
l merges fo
r
--
p
ar
e
nts
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Bracey
revision
.
c: discount
side bran
c
hes when computing
TREESAME
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
r
e
v
ision
.
c
:
add BOT
T
OM f
l
a
g for
commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
simplify-mer
g
es: dr
o
p merge from
i
rrelevant s
i
de branch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kev
i
n Bracey
s
i
m
plify-merges: neve
r
remove all TREESAME parents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
revision
.
c: Mak
e
--ful
l
-hi
s
tory consider more merge
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Br
a
c
ey
Do
c
umentat
i
on: avoid "uninterestin
g
"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
in Bracey
rev-l
i
s
t
-options
.
txt: c
o
rrect T
R
E
ESAME for P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t6111:
a
dd parents to tests
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t6111: new TRE
E
SAME
t
e
st set
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
Bracey
t6019: tes
t
file dropped in -s ours merge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
dec
o
rate
.
c: compact table when growing
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
revis
i
on
.
c: treat A
.
.
.
B merge base
s
as
i
f
manually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
K
evin Bracey
t6019: demonstrate --ances
t
ry-path
A
.
.
.
B
b
r
eakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
K
e
v
in Bracey
cherry
-
pick
/
revert: ma
k
e
usage s
a
y
'<commit-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kev
i
n Brac
e
y
checkout: abbrevia
t
e hash i
n
s
u
gge
s
t_reattach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Ke
v
i
n
Bracey
git-merge-one-fil
e
:
s
end "ERROR:" messages to stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
gi
t
-merge-one-file
:
sty
l
e cleanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevi
n
Bra
c
ey
m
e
rgetools
/
p4m
e
rge: create a bas
e
if none av
a
ilable
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin
B
ra
c
e
y
m
ergeto
o
ls/p4merge
:
swap LOCAL and REMOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
K
e
vin
Bracey
git
.
c: make
u
sage match man
u
al
page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin B
r
ac
e
y
Tra
n
sl
a
te git_more_i
n
fo_stri
n
g consistently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree