repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'bc/archive-pax-header-mode'
2014-07-21
Charles Bailey
Fi
x
con
t
rib/sub
t
ree Ma
k
efile to patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Cha
r
les
B
aile
y
filter-branc
h
: eliminat
e
duplicate mapped pare
n
ts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Ba
i
ley
comp
a
t
/bswap
.
h: de
t
ect e
n
d
i
a
n
ness on more platfor
m
s
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Char
l
es Bail
e
y
tests: d
o
n't rely o
n
strerror text when testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Cha
r
les Bailey
di
r
.
c:
m
ake git
_
fnmatch(
)
not
i
nline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles B
a
iley
mergeto
o
l: Re
m
ove expli
c
it r
e
fer
e
nces to /
d
ev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Ba
i
ley
stash
t
e
s
ts: st
a
sh can
l
o
se
d
ata in a file r
e
moved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles Bailey
stash: Don't
o
verwrite files that ha
v
e gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
a
rl
e
s
B
ai
l
ey
Docum
e
nta
t
ion:
Describe oth
e
r
s
it
u
ations wh
e
r
e
-z
af
f
ects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Bailey
Chang
e
xdl_me
r
ge to gener
a
te
o
utput
e
ven for null
m
erges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
l
es Bail
e
y
t6023: merge-file fa
i
ls to o
u
tput anything for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bail
e
y
mer
g
etool
:
f
i
x running mergetool in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mer
g
etool: Add a
test for ru
n
ning
me
r
ge
t
ool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
m
e
rgetoo
l
:
respe
c
t
autocrlf
b
y using
chec
k
out-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Bailey
mergetool: Don
'
t
k
ee
p
te
m
porary
m
e
r
ge files
unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Char
l
es Bailey
merg
e
tool: Add prompt to c
o
ntinue
a
fter
fai
l
ing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arle
s
Baile
y
Add -y/
-
-no-prom
p
t option to m
e
rgetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bai
l
ey
Fix some t
a
b/
s
p
ac
e
inconsistencies in git-merge
t
oo
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
rles Bailey
git-archive: w
o
rk in bare
r
e
pos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git
a
r
c
hi
v
e respect core
.
autocrlf
when cr
e
ating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Add new te
s
t to demonstrate git archive co
r
e
.
autocr
l
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
ley
merge-tool docum
e
ntation: descri
b
e cus
t
om comma
n
d usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Bailey
git-merget
o
ol documentaiton: show
toolnames in typ
e
writer
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
ey
Add a very b
a
sic test
script
f
o
r
git mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
l
es Bail
e
y
Teach git m
e
r
g
et
o
ol to use
c
usto
m
c
ommands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an int
e
rnal varia
b
l
e
of merget
o
ol to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
B
a
i
l
ey
Ti
d
y
up git mer
g
etool'
s
backup file
b
eha
v
iou
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
g
itk: Fix the Makefile to
c
ope with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
arles Bailey
Re
m
ov
e
old generate
d
f
i
l
es fro
m
.
git
i
gnore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
har
l
es Bailey
F
i
x git-instaweb breakage
o
n MacOS X due to
the l
i
mited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Ch
a
rles Bailey
Fix c
l
one
n
ot
to ignore de
p
th when perfor
m
ing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree