repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mh/maint-lockfile-overflow'
2013-06-27
Kevin B
r
a
cey
am: replace
u
ses
of --resolved with --continue
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
K
evin Br
a
ce
y
Documentatio
n
: Move
"git diff <
b
lob> <blo
b
>"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
revis
i
o
n
.
c
: make d
e
f
ault histor
y
conside
r
b
ottom commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
B
r
a
c
e
y
revision
.
c: do
n
't show all merges for --parents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kev
i
n Bracey
r
evision
.
c: di
s
count side branches when comp
u
ting TREESAME
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
revision
.
c: ad
d
B
OTTOM
f
lag
f
or
c
omm
i
t
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin Bracey
simplify-merges: d
r
op
m
e
rg
e
f
r
om irr
e
lev
a
nt side branc
h
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin Bracey
s
i
mplif
y
-
m
erges: ne
v
er remove all TREESAME paren
t
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
B
racey
revis
i
on
.
c
:
Make --full-history
consider m
o
r
e m
e
r
g
es
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
i
n
Bracey
Document
a
tion
:
avoid
"uninteresting"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
rev-list-
o
p
tions
.
t
xt: co
r
rect TREESAME for P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
in
B
ra
c
e
y
t61
1
1:
a
dd parents to tests
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t6111: new TREESAME test set
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
in Brac
e
y
t6019: tes
t
file
dr
o
pped i
n
-s ours
merge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
Bra
c
ey
decorate
.
c: compact table w
h
en growing
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
B
racey
r
evision
.
c:
trea
t
A
.
.
.
B me
r
ge bases as if manually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Ke
v
i
n
B
r
acey
t6019: demonstrate -
-
anc
e
stry-path A
.
.
.
B breakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin Bracey
cherry
-
p
ick/reve
r
t: make usage say
'
<commit-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin Bracey
checkout: abbr
e
viat
e
hash in suggest_r
e
attach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin
Bracey
git-me
r
ge-one-f
i
le: send
"
ERROR:"
messages to stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Brace
y
g
it-mer
g
e-one-
f
ile: styl
e
c
l
eanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin
Bracey
merget
o
o
l
s/p4merge: c
r
eate a b
a
s
e
if none availa
b
le
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
mergetools/p4merge: swap LOCAL a
n
d REMOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
K
e
vin Bracey
git
.
c: make usage match manual page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
K
evin Bra
c
ey
T
r
ans
l
ate git_more_info_str
i
ng consiste
n
tl
y
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree