repo.or.cz
/
alt-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 'cr/git-work-tree-sans-git-dir' into maint
2013-05-16
Kevin Brace
y
r
ev
i
sion
.
c: treat A
.
.
.
B m
e
rge bases as if
m
anually
.
.
.
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-05-13
Kevin Bracey
t6
0
19:
demonstrate --an
c
estry-p
a
th A
.
.
.
B bre
a
k
age
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-24
K
e
vin Bracey
che
r
ry
-
pick/r
e
vert:
m
a
k
e
u
s
age say '<commit-ish>
.
.
.
'
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-04-08
K
e
v
i
n Bracey
c
hecko
u
t: abbreviate hash in sugge
s
t_reattach
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Br
a
ce
y
git-mer
g
e-
o
ne-file: send "E
R
ROR:" message
s
t
o
s
t
derr
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-25
Kevin Bracey
g
it
-
merge-one-file: styl
e
cleanup
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
Kevin Br
a
c
e
y
mergetools/p4merge: create a base
i
f none avai
l
able
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-13
K
evin
Br
a
cey
mergetoo
l
s
/p4merg
e
: swap LOCAL
and REMOTE
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-11
Ke
v
in
Brac
e
y
git
.
c: make usage m
a
tch m
a
nual page
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree
2013-03-10
Kevin Bracey
T
ranslate
g
it_more
_
inf
o
_
s
tring consistently
Signed-off-by:
Kevin Bracey
<kevin@bracey.fi>
commit
|
commitdiff
|
tree