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
K
e
vin Br
a
cey
am: replace uses of --resol
v
ed with --continue
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
Kevin
B
racey
Docume
n
t
ation: Move "git diff <blob>
<
b
lob>"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bra
c
ey
revision
.
c: make default
history co
n
si
d
e
r b
o
t
t
o
m
commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
revision
.
c: don't
s
how all merge
s
for
--
p
arents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bra
c
ey
revision
.
c: d
i
scount side
b
ranches when
compu
t
ing TREESAM
E
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vi
n
B
r
acey
revi
s
io
n
.
c: add BOTTOM flag fo
r
commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
si
m
plify-merges: drop me
r
ge
f
rom irrelevant side branch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
B
racey
simplify-merges: never
r
emove al
l
TREE
S
A
M
E
pa
r
ents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
B
racey
r
evis
i
on
.
c
: Make --full-
h
ist
o
ry consider more merge
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kev
i
n Brace
y
D
o
cumentation: avoid "unin
t
eresting"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kev
i
n
Bracey
rev-list-o
p
tions
.
t
x
t: correct TREES
A
ME for P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin B
r
acey
t
6
111:
add parents to
t
es
t
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin B
r
acey
t6111:
new TRE
E
SAME test
s
et
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
B
racey
t6019: test
f
ile d
r
o
pped in -s ours merge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
deco
r
ate
.
c: compac
t
t
ab
l
e wh
e
n growing
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin B
r
acey
re
v
ision
.
c: treat A
.
.
.
B
m
e
rge bases as if manu
a
lly
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Bracey
t6019: demonstrate --an
c
e
stry-path
A
.
.
.
B breakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin Bracey
cherry-pick/revert:
m
a
k
e usage say
'<com
m
it-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kev
i
n Br
a
cey
checkout: abbrev
i
ate hash in
s
u
g
gest_reattach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
K
e
vin Br
a
ce
y
git
-
merge-one-file: send "ERROR:" m
e
ssage
s
to
stder
r
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kev
i
n Br
a
ce
y
git-merge-one-file: sty
l
e clea
n
u
p
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
m
e
rgetools
/
p4merge:
c
reate a base if none available
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Ke
v
in
Brac
e
y
mergetools/p4merge:
s
wap LOCAL
a
nd
REMOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Kevin Bracey
git
.
c:
m
ake usage
match
m
anual page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin
Bracey
Translate git_m
o
r
e
_
info_string consistentl
y
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree