repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
completion: --set-upstream option for git-branch
2010-04-18
C
harles Bailey
Documentation: Descri
b
e other situations wher
e
-z
a
ffects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
C
h
ange x
d
l_
m
e
r
ge to g
e
nerate out
p
ut e
v
en f
o
r null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: merge-fi
l
e fails to ou
t
p
u
t anything for a d
e
ge
n
erate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
me
r
g
e
t
ool: fix running
merge
t
ool in su
b
-directo
r
ie
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
a
r
les Bailey
m
erget
o
ol:
A
d
d
a te
s
t fo
r
running mer
g
etool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Char
l
e
s Bailey
m
e
rg
e
to
o
l
:
respect
a
utocrlf by using
c
h
e
c
k
out-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
harle
s
Ba
i
ley
mer
g
etool: Don't kee
p
t
e
m
porary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
a
r
le
s
Bailey
mergetool
:
Add prompt to cont
i
nue aft
e
r faili
n
g
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
B
a
i
ley
Add
-y/-
-
no-prompt option t
o
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
ar
l
es Bailey
Fix some
t
ab/space
i
nc
o
nsistencies in
g
it-mergetool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-archive
:
work i
n
bar
e
r
ep
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
iley
Make git ar
c
hive respect core
.
autocrlf when cr
e
ating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles Bai
l
e
y
Add new tes
t
to demons
t
ra
t
e git
archi
v
e
core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
ai
l
ey
merge-tool do
c
u
m
entation: describe custom c
o
mmand us
a
ge
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Bailey
git-merg
e
tool doc
u
mentaiton: show t
o
olnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harl
e
s Bailey
Ad
d
a v
e
ry basic t
e
st script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles B
a
i
ley
Tea
c
h
git me
r
ge
t
ool
to
u
se custom commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Changed an internal
v
ariable
o
f mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy
u
p git mergetool's
b
ackup
f
i
l
e behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
es Bailey
gitk: Fix t
h
e
M
a
kefile
t
o cope with systems lackin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove old g
e
n
erated
f
iles f
r
om
.
g
itignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git-
i
nsta
w
eb brea
k
age on MacOS
X due to the
limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
a
rles
Bai
l
ey
Fix
clone not
to ignore
d
epth when performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree