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 'ed/color-prompt'
2013-06-27
Kevin
B
race
y
am: repla
c
e uses of --resolve
d
with --con
t
in
u
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
Ke
v
in Bracey
D
o
cumentation
:
Move "git diff <bl
o
b> <b
l
ob
>
"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin B
r
acey
r
e
vision
.
c:
m
ake default histo
r
y consider bottom comm
i
ts
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
B
racey
revisio
n
.
c: don't show
a
ll merges for --parents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
Brace
y
revisi
o
n
.
c:
disc
o
un
t
side
b
ranches when computin
g
TREESAME
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brace
y
revis
i
on
.
c:
a
dd
BOTTOM
f
l
ag for commit
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
simplify-merg
e
s: drop merge from
i
rrelevant side branch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin Brac
e
y
simp
l
ify-merges: n
e
ver rem
o
ve all TREESAME parents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
in B
r
a
cey
rev
i
sion
.
c
:
Make --
f
ull-his
t
ory consider mo
r
e merges
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin Bracey
D
o
c
u
me
n
tation
:
avoid "un
i
nt
e
resting"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
rev-list-options
.
txt:
c
or
r
ect TR
E
ESAME for
P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t6111:
add parents to t
e
sts
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t6111: new TREE
S
AME t
e
s
t
s
et
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin
Brace
y
t6019: test fil
e
dropped in
-
s ours merge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
decor
a
te
.
c
:
comp
a
ct table when growi
n
g
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kev
i
n Brace
y
re
v
i
s
ion
.
c: treat A
.
.
.
B
m
erge bases
a
s if
manu
a
lly
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Ke
v
in Bracey
t6019: demons
t
ra
t
e --ancestry-pat
h
A
.
.
.
B breakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin Bracey
c
h
erry
-
pick/revert: make usage say '<commi
t
-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin Bracey
chec
k
o
u
t: abbreviate hash in
s
u
g
gest_reattac
h
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
g
i
t-
m
erge-one-file
:
send "ERROR
:
"
messages to stde
r
r
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Br
a
c
e
y
git
-
mer
g
e-one-file: style cleanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin
Brac
e
y
mergetools/p4me
r
g
e
: create
a
base
i
f none avai
l
abl
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
m
ergetools/p4mer
g
e:
swap LOCAL and REMO
T
E
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
K
e
v
in Bracey
git
.
c: make usage match manual pa
g
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
K
e
v
in Bracey
Translat
e
g
i
t
_more_info_string consistently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree