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
Update draft release notes for 1.8.4
2013-06-27
Kevin
Brac
e
y
am: rep
l
ace uses of -
-
resolved with --continue
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
Kevin Bracey
Docu
m
entation
:
M
o
ve "git diff <b
l
o
b> <blob>
"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kev
i
n Bracey
revi
s
ion
.
c: make defa
u
lt
histo
r
y
c
o
n
s
ider bottom commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brace
y
revisi
o
n
.
c: don
'
t show all me
r
ges for
--par
e
nts
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
v
in Brace
y
revision
.
c
:
discount
sid
e
b
r
a
n
c
h
es when computi
n
g TREESAME
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
revision
.
c
: add BOT
T
OM flag
f
or co
m
mits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brace
y
sim
p
li
f
y-merges: drop merge fr
o
m
i
rrelevan
t
side branch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
si
m
p
lify-merges: never
rem
o
ve all TR
E
ESA
M
E
parents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kev
i
n
B
r
a
cey
revision
.
c: Mak
e
--full-history
c
onsider mo
r
e m
e
rges
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Br
a
ce
y
Documentation: avo
i
d "un
i
n
t
eres
t
ing"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kev
i
n Bracey
re
v
-l
i
s
t
-
optio
n
s
.
t
x
t: correct TR
E
ESAME
for P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
in Bracey
t6111: add
par
e
nts to tests
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
v
in B
r
acey
t6111: new T
R
EESAME test s
e
t
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
i
n B
r
acey
t6019: test file dropp
e
d i
n
-s our
s
m
e
rge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evi
n
Bracey
decor
a
te
.
c:
c
ompact table
w
h
en gro
w
i
n
g
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
in Bracey
revisio
n
.
c: treat A
.
.
.
B
merge b
a
ses a
s
if manually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin
B
racey
t6019: de
m
onstrate
--an
c
e
s
try-path A
.
.
.
B
breakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin Br
a
cey
cherry-pick/reve
r
t
:
make usa
g
e
say '<commit-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
K
ev
i
n Bracey
c
h
eckout:
abbre
v
iate hash in suggest_rea
t
tach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevi
n
B
racey
git-m
e
rge-
o
ne-file: send "ERROR:" me
s
sage
s
to stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
git-merge-one-file: style cleanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
mergetools/p4merge: create a
base
if no
n
e av
a
i
l
able
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
mergetoo
l
s
/p
4
merge: swap L
O
CAL and
REM
O
TE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Kevin
B
racey
gi
t
.
c: make usage
match manual pa
g
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin Brace
y
Translate g
i
t
_
more_info_string consiste
n
tly
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree