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 'ed/color-prompt'
2013-06-27
Kevin Bracey
am: re
p
lace u
s
es o
f
--re
s
o
l
v
ed
w
i
t
h --con
t
inue
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
Ke
v
i
n
Bracey
Do
c
umentatio
n
: Move "gi
t
diff
<blob> <blob>"
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
side
r
bottom commit
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
Bracey
r
e
vision
.
c: don't show all me
r
g
e
s for --pa
r
e
nts
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
B
r
a
c
ey
revision
.
c:
d
iscount
s
ide branches when
c
o
m
puting TREESAME
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
r
e
vis
i
on
.
c
:
add BO
T
T
OM
f
lag fo
r
c
ommits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
simplify-mer
g
e
s: drop merg
e
from irrelevan
t
side branch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Bracey
simpl
i
fy-merges:
never
r
emove all
T
R
E
ESAME parents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brac
e
y
revision
.
c:
M
a
k
e --full-histo
r
y cons
i
der
m
ore merges
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
Do
c
umen
t
at
i
on: av
o
id "uninter
e
stin
g
"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
rev-lis
t
-options
.
txt: correct
TREESAME for P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t6111
:
ad
d
parents to tests
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Br
a
cey
t6111: ne
w
TREESAME test set
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
B
racey
t601
9
: test file dropped in -s ours merge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
Bracey
de
c
o
r
ate
.
c: comp
a
c
t table when gro
w
ing
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brace
y
revision
.
c:
treat A
.
.
.
B m
e
rge
bases
as
i
f
manually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Bracey
t6019:
demons
t
r
at
e
--ancestry-path
A
.
.
.
B bre
a
kage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin Br
a
ce
y
cherry-pick/revert: make
usage say '<commit-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Ke
v
in Bracey
che
c
k
o
ut:
a
bbreviat
e
hash in suggest_r
e
attach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
git-merge-one-file: send
"
ER
R
O
R:" messa
g
es to stderr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
git-me
r
ge-one-file: style cle
a
nup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Ke
v
in Bracey
me
r
getoo
l
s/p
4
me
r
ge: create a b
a
se if none
a
vailable
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
K
evin Bracey
mergetools
/
p4merge: swap
L
OCAL and REMO
T
E
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
K
e
vi
n
Bracey
git
.
c: make
u
sage m
a
tch
m
a
n
ual page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin Brac
e
y
Translate
g
i
t_more_info_string consi
s
tently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree