repo.or.cz
/
git
/
jnareb-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 'nd/clone-depth-zero'
2010-08-20
Charles Bailey
m
e
rgetool: Remove explici
t
references to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Ch
a
rle
s
Bailey
stash t
e
sts: stash can lose data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bai
l
e
y
s
t
as
h
: Don't overwrite fi
l
es tha
t
h
a
v
e
gone fro
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
les Bailey
D
o
c
u
men
t
ation: De
s
c
ribe
oth
e
r
s
i
tuations where
-
z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Chan
g
e x
d
l_m
e
rg
e
to generate
outp
u
t
e
ven for null
m
er
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: merg
e
-file fails t
o
output a
n
ything for
a dege
n
erate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merget
o
ol: fix running
merget
o
ol in sub-dire
c
tories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
es Baile
y
merge
t
o
o
l:
Add a tes
t
for running
m
erge
t
ool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
merge
t
ool: respec
t
autoc
r
l
f
b
y
using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
merg
e
t
o
ol: Don't k
e
ep
t
e
m
p
o
rar
y
merge files unles
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles Bailey
mer
g
etool: A
d
d
prompt to co
n
ti
n
ue after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
es Ba
i
l
e
y
Ad
d
-y/-
-
no-pr
o
mpt option to mergeto
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix
some tab/space incon
s
istencies in git
-
mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Char
l
es
B
ailey
git-
a
rchive: wo
r
k in bare r
e
pos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Make git archive re
s
pe
c
t c
o
re
.
auto
c
rlf
when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles Bailey
A
d
d new test to de
m
on
s
trate git archiv
e
co
r
e
.
auto
c
rlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merg
e
-tool docu
m
en
t
a
t
ion: describe custom
command
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
g
i
t-me
r
getool
d
oc
u
mentaiton: show toolnames in typewri
t
e
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
Add a very basi
c
test script for git
m
erge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Tea
c
h git
mergetool to use cus
t
o
m commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
C
hanged
a
n internal var
i
ab
l
e
of mergetoo
l
t
o
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Tidy
up git mergetool's backup
f
i
le
b
ehaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charle
s
Bailey
gitk: Fix the M
a
kefile to cope wi
t
h systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
arles Bailey
Remove
o
ld
gene
r
ated files fro
m
.
gi
t
ignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles B
a
iley
Fi
x
git-inst
a
web bre
a
k
a
ge
o
n
MacOS X d
u
e
to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charle
s
Bailey
Fix clon
e
not to
i
gno
r
e depth when
p
erformi
n
g a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree