repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Recent MinGW has a C99 implementation of snprintf functions
2010-04-18
Ch
a
rles Bai
l
ey
Document
a
t
io
n
:
D
escribe oth
e
r situations where -z affe
c
ts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ailey
Change xdl_merge to ge
n
erate output
even for
n
ull merge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: merge-fi
l
e fa
i
l
s to
output
a
nything fo
r
a de
g
enerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
m
e
rgetool: fix run
n
ing
merg
e
tool in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Baile
y
mer
g
eto
o
l: Add a test for runni
n
g mergetoo
l
in a s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Char
l
e
s
Bailey
m
erg
e
t
ool:
r
espect
a
ut
o
c
r
lf b
y
using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
Bail
e
y
me
r
getool: Don't
k
eep temporary merge fil
e
s unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
ey
mer
g
etool: A
d
d prompt to co
n
t
i
nue af
t
er failing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles B
a
iley
Add -
y
/--no-prompt o
p
tion to
merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
rl
e
s Bailey
Fix some tab/space
in
c
onsistenci
e
s in git-me
r
getool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
Bailey
git
-
archive:
work in
bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git archive respect cor
e
.
aut
o
cr
l
f when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Add
n
ew tes
t
to d
e
monstr
a
t
e gi
t
archiv
e
cor
e
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool
documentat
i
on
:
d
escribe custom
c
o
mm
a
nd usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
a
r
les Bailey
git-merg
e
to
o
l documentaiton
:
show to
o
lnames in ty
p
ewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
har
l
es Bai
l
ey
A
dd a very b
a
si
c
te
s
t script fo
r
git mergeto
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harle
s
Bailey
Teach git mergeto
o
l t
o
use custom commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s
B
ailey
C
hanged an internal vari
a
b
le o
f
mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
iley
Tidy
u
p g
i
t mer
g
etool's backup
f
ile behavi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: Fix the Makefile to cope with systems l
a
cki
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles
B
aile
y
Remove old generated files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Char
l
es B
a
il
e
y
Fix git-instaweb breakag
e
o
n
MacOS X due to the
limite
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Cha
r
les
Ba
i
l
ey
F
ix
c
l
one not to ign
o
re dept
h
w
hen per
f
o
r
m
i
ng a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree