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 'af/rebase-i-merge-options'
2013-06-27
Kevin Brace
y
am: replace uses of --re
s
olved with --
c
ontinue
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
Kev
i
n
Bracey
Documentat
i
on: Move "git diff <b
l
ob>
<
blo
b
>"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
B
racey
r
evision
.
c: make
d
efault
hi
s
tory consid
e
r bot
t
om c
o
mmits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
B
racey
revision
.
c: don't sh
o
w a
l
l merge
s
fo
r
-
-
p
are
n
ts
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
revision
.
c: discount si
d
e b
r
a
nch
e
s when c
o
mputi
n
g
TRE
E
S
AME
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
B
racey
revision
.
c: add BO
T
TOM
f
lag
f
or
commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
s
implify-mer
g
es: d
r
op merg
e
from irre
l
evan
t
side
b
ranch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin
Bracey
s
implify-merges: ne
v
e
r
remove all
T
REESAME par
e
nts
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Bracey
re
v
isio
n
.
c:
Make --full-
h
istory consider more merges
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin Brace
y
Documentation: avo
i
d "uninteresting"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
rev-list-opti
o
ns
.
t
x
t: correc
t
TRE
E
SAM
E
f
or
P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t61
1
1:
a
dd
parents to tests
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Br
a
ce
y
t61
1
1: n
e
w TRE
E
SAME test set
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bra
c
ey
t6019:
t
est file dropped in -s ou
r
s
merge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
decor
a
te
.
c: c
o
mpact
t
able when growing
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin
B
rac
e
y
rev
i
sion
.
c: treat A
.
.
.
B merge bases as if
man
u
al
l
y
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Bracey
t
6
019: demonstrate --ancestry-path A
.
.
.
B breakag
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin Bracey
cherry-
p
i
c
k/revert: make us
a
g
e
s
ay '<
c
omm
i
t-i
s
h>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevi
n
Bra
c
e
y
c
h
eckout: abbrevia
t
e
h
a
sh
in su
g
gest_reattac
h
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin
B
ra
c
ey
g
i
t-merge-one-fi
l
e: send "
E
RROR:" mes
s
ages to stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin
Bra
c
ey
git-merge-one-file: sty
l
e
c
leanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
K
evin Bracey
mergetool
s
/
p
4
m
erge: create a ba
s
e if none
av
a
ilable
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin
Bracey
merge
t
ools/p4merge:
swap LOCAL and REMOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Kevin Bracey
git
.
c
:
m
a
ke
u
sage m
a
tch manual page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin Bracey
Translate git_more_info_string cons
i
stently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree