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 'maint'
2013-06-27
Kevin Brace
y
am:
r
eplace uses
o
f
--res
o
lved with --continu
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
Kevin Bracey
Docu
m
entation
:
Move "git dif
f
<
blob> <blob>"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin Bracey
r
e
v
ision
.
c
:
make default history consider
b
ottom com
m
its
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
in Bracey
rev
i
sion
.
c:
don
'
t show a
l
l
mer
g
es for --par
e
n
t
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bra
c
e
y
revision
.
c:
d
i
scount side
b
r
anches when comput
i
ng TREESAME
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brac
e
y
revi
s
ion
.
c: add BOT
T
OM fl
a
g for
c
ommit
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
sim
p
lify
-
merges: d
r
o
p
mer
g
e fro
m
irr
e
leva
n
t side
b
ranch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
in
B
rac
e
y
simpl
i
f
y-merge
s
: never remove all TREE
S
AME
p
arents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin
Bracey
revision
.
c: Make
--full-hi
s
tory consid
e
r m
o
r
e
merges
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
Docu
m
entation: a
v
oid "uninteresti
n
g
"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
v
in Bracey
rev-lis
t
-options
.
t
x
t:
c
o
rrect
TR
E
ESAME for
P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t
6
11
1
:
a
dd parents to tests
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin B
r
acey
t6111: new TREE
S
AME test set
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
i
n
Bracey
t
6019: test
f
i
l
e dropped i
n
-s ours merge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
decorate
.
c: compact table when growing
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
Bracey
revision
.
c:
t
reat A
.
.
.
B merge ba
s
es as
i
f
manually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Bracey
t
6
019: demo
n
strate --ancestry-
p
a
th A
.
.
.
B breakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin Bracey
che
r
r
y-pick/reve
r
t: make usage say '
<
comm
i
t-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
K
evin Bracey
checkou
t
:
a
bbreviate hash in suggest_reattach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
K
evin Bracey
g
i
t
-merge-on
e
-file: s
e
nd
"ERR
O
R:" m
e
ssages to stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
g
i
t
-
merg
e
-one-file: s
t
yle
cleanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
K
e
v
i
n Bracey
mergetools/p4merge: c
r
eate a base
i
f
n
one availa
b
le
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Br
a
cey
merg
e
tools/p4merge: swap LOCAL and REMOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Kevin B
r
ace
y
git
.
c: m
a
ke usage
m
atch manual p
a
ge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin Bracey
Tr
a
n
s
l
ate git_more_info_string consistently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree