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 'cp/submodule-custom-update'
2013-06-27
Kev
i
n
Bracey
am:
r
ep
l
ace uses of
-
-re
s
olved with --continue
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-06-18
Kevin Bracey
Doc
u
m
ent
a
ti
o
n: Move "gi
t
diff <blob> <
b
lob>"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
e
vi
n
Br
a
cey
r
e
vision
.
c: make
d
efau
l
t
history consider bottom co
m
m
i
t
s
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin B
r
acey
revision
.
c: don't s
h
ow all
mer
g
es for -
-
p
a
rents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevi
n
Bracey
r
e
vision
.
c: discoun
t
s
i
de branches when computing TREE
S
AM
E
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin B
r
acey
revision
.
c: add
B
OTTOM flag for
commits
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Brac
e
y
s
i
mplify-
m
er
g
es:
d
rop merge fr
o
m irrele
v
ant s
i
de branch
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Bracey
simplify-merg
e
s
:
neve
r
remove
all TR
E
ESAM
E
parents
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
revisio
n
.
c: Make
-
-full-history con
s
ider more
m
e
rges
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Br
a
cey
Do
c
umentation: a
v
oid "uninteresting
"
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
rev-list-options
.
txt:
correct T
R
EESAME fo
r
P
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
K
evin Bracey
t
6
111: add parents to
tests
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t6111: new
T
REES
A
ME test set
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Bracey
t6019: test file dropped in -s our
s
merge
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin Brace
y
deco
r
at
e
.
c: compac
t
table when growing
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-16
Kevin B
r
a
c
ey
r
evision
.
c: treat A
.
.
.
B merge bas
e
s as if m
a
nually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Brace
y
t6019: d
e
monstrate --
a
ncestry-path A
.
.
.
B breaka
g
e
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
Kevin Br
a
c
e
y
cherry
-
p
ick/rev
e
rt: make
u
s
a
ge sa
y
'<commit-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
Kevin Bracey
che
c
k
o
ut
:
ab
b
r
e
viate ha
s
h
in
suggest_
r
eattach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevi
n
Brace
y
g
i
t-merge-one-file: send
"
ERR
O
R:" me
s
s
a
ges to st
d
err
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
gi
t
-merge-one-file: style c
l
eanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
K
e
vin Bracey
merget
o
ols/p4merge: create a base if non
e
available
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin B
r
acey
m
e
r
ge
t
o
ols/p4merge: swap
L
OCAL a
n
d REMOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
K
evin Bracey
git
.
c:
make usage matc
h
ma
n
ual page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
K
e
vin B
r
acey
T
r
an
s
late git_more
_
i
n
fo_string consistently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree