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 'rr/remote-branch-config-refresh'
2013-06-27
Kevin Bracey
a
m
: replace uses
of --re
s
o
l
v
e
d
wit
h
--cont
i
nue
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
Kevin
B
ra
c
ey
Documentation
:
Move "
g
it
d
iff <blob> <blob>"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brace
y
re
v
ision
.
c: make default history co
n
sider b
o
ttom commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Bracey
revision
.
c:
d
o
n
't
show all
m
erges for --par
e
nts
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bra
c
e
y
r
evision
.
c:
discount
si
d
e bra
n
ches
when
c
omputing
TREESAME
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bra
c
e
y
r
evision
.
c: add BOTTOM fla
g
for commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Br
a
cey
si
m
p
lify-mer
g
es: d
r
op merge from irre
l
e
vant s
i
de br
a
nch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
v
i
n Bracey
simplify-merges: nev
e
r remove
all TREESA
M
E parents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
B
racey
revision
.
c
: Make --full-history cons
i
der more merges
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bra
c
e
y
Documen
t
ation: a
v
oid "un
i
n
t
eresting
"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
i
n
Br
a
c
ey
rev-l
i
st
-
opti
o
ns
.
t
xt: corr
e
ct TREESAME fo
r
P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Ke
v
in B
r
acey
t61
1
1
: a
d
d parents to
tests
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brac
e
y
t6
1
1
1: ne
w
TREESAME test se
t
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brace
y
t6019
:
te
s
t
file
d
ropped in -s ours merge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
decorate
.
c: compac
t
tab
l
e
w
hen g
r
o
wing
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vin Bracey
re
v
ision
.
c: treat A
.
.
.
B merge bases
a
s if manual
l
y
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Bracey
t6019:
d
emonstrate --
a
ncestr
y
-
p
ath
A
.
.
.
B
breakage
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
K
evin Brace
y
ch
e
rry-pick/r
e
ver
t
: make
u
s
age
s
ay '<commi
t
-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin Bracey
chec
k
out: abbrevia
t
e hash
in sugge
s
t
_
reatt
a
ch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
g
it-me
r
g
e
-one-file: send
"ERR
O
R
:" messages to s
t
der
r
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin B
r
ac
e
y
git-merge-one-file
:
st
y
le cle
a
n
up
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bra
c
ey
mergeto
o
ls/p4merge: creat
e
a b
a
se if none available
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Bracey
m
ergetools/p4merge: swap LOCAL
and R
E
M
OTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Kevi
n
Bracey
git
.
c: make
u
sa
g
e match
m
anua
l
pa
g
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin Br
a
cey
Translate git
_
mor
e
_i
n
fo_str
i
n
g
consis
t
e
n
t
ly
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree