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
mergetool: respect autocrlf by using checkout-index
2009-01-27
C
h
a
r
les Bailey
mer
g
et
o
o
l
: r
e
spect autocr
l
f by
u
sing ch
e
ckout-inde
x
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
C
har
l
es Bailey
mergetoo
l
: Don't keep t
e
mp
o
rary merge
fi
l
es
u
n
l
e
ss
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
les
Bail
e
y
mergetool: Add prompt to continue aft
e
r
failing t
o
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rl
e
s Baile
y
Add -y/--no-prompt opti
o
n to mergetool
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-11-15
Charles
Baile
y
Fix some tab/sp
a
ce inconsistenc
i
es in git-merget
o
ol
.
s
h
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-10-26
C
harles Bailey
g
it
-
archive: wo
r
k i
n
bare repos
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
ailey
M
a
ke git archive re
s
pec
t
c
o
re
.
autocrlf when
c
r
eatin
g
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les B
a
iley
Add
new test to dem
o
nstr
a
te g
i
t archive core
.
autoc
r
l
f
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
C
harles Bailey
m
e
r
ge-tool do
c
umenta
t
io
n
: describe custom
co
m
m
a
nd u
s
a
ge
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mergetool
d
ocumentai
t
on: show tool
n
ame
s
in typewriter
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very basic
test script for gi
t
mergeto
o
l
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Teach
g
i
t
mergeto
o
l to use custom commands def
i
ned
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
ey
C
h
anged an i
n
terna
l
variable
of mergetool to support
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tid
y
up
gi
t
mergetool's backup file
b
ehaviour
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2008-01-11
Ch
a
r
les
Bai
l
e
y
gi
t
k: Fix the
Makef
i
le to
c
ope w
i
th systems lacking
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-21
C
h
a
rles B
a
i
l
ey
Remove
old generated files from
.
g
it
i
gnore
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-19
C
h
arles Baile
y
Fix git-i
n
st
a
web b
r
eakage
on M
a
cOS X du
e
to t
h
e l
i
mited
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree
2007-12-12
C
h
ar
l
es B
a
iley
Fix clon
e
not to ignore depth
when performing
a loc
a
l
.
.
.
Signed-off-by: Charles Bailey <
charles@hashpling.org
>
commit
|
commitdiff
|
tree