repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'rs/code-cleaning'
2014-07-21
Charles Ba
i
l
e
y
Fi
x
contrib/subtre
e
M
akefile to patch #
!
l
ine
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
C
h
arles Bail
e
y
filter-branch: elimin
a
te duplicate mapped
p
arents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Ba
i
ley
comp
a
t
/
bswap
.
h: detect endianness on more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles
B
a
iley
te
s
ts: do
n
't rely on s
t
rerr
o
r text
w
hen testing r
m
dir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
di
r
.
c: m
a
ke git
_
fnmatch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Ch
a
rles
Bailey
mergetoo
l
:
Remove explicit references to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Cha
r
les Bai
l
ey
sta
s
h
t
ests: stash ca
n
lo
s
e da
t
a
in a file r
e
moved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bail
e
y
s
tash: Don
'
t overwr
i
te files
that have go
n
e from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
les
B
ail
e
y
Docum
e
ntation
:
Desc
r
ibe other situations where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charle
s
B
ailey
Ch
a
nge xdl_merge t
o
g
e
nerate output
even
for
n
ull
merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les Bailey
t6023: m
e
rge-fi
l
e
fails to output
a
nything f
o
r a de
g
ener
a
te
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merg
e
too
l
: fix running mergetool in sub
-
direct
o
ries
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merge
t
ool
:
Add a test for running mergetoo
l
in a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Ch
a
r
les
B
a
i
ley
m
e
rgetool: respect autocrlf by usi
n
g checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
e
y
mergeto
o
l: Don't
k
e
ep
t
emp
o
rary merge files
u
nless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Char
l
es Bailey
merget
o
ol: Add prompt to con
t
inue
a
fter failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--no-pr
o
m
pt option t
o
m
e
rge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
Fix
som
e
t
a
b
/
space inc
o
ns
i
stencies in
git
-
mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
har
l
es Bailey
git-archive: wo
r
k in
b
a
re rep
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
Bailey
Make git archive respect core
.
a
utocr
l
f when cr
e
ating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Ad
d
new tes
t
t
o
demonstra
t
e g
i
t archive core
.
au
t
ocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool docume
n
tation: describ
e
custom command
u
s
age
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
ley
git
-
me
r
geto
o
l docume
n
taiton: show toolnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very ba
s
ic test script
for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
e
s
B
a
i
ley
Teac
h
gi
t
mergetool to use custom comm
a
nds d
e
fined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
C
h
ang
e
d an
i
nterna
l
va
r
iable of
m
ergetool to su
p
p
ort
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
il
e
y
Tidy up g
i
t
mergetool
'
s
backup file behaviou
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
git
k
: Fix th
e
M
a
kefile
t
o cope
with
systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charl
e
s Bailey
R
e
move old
generated file
s
fr
o
m
.
gitigno
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
h
arles Bailey
F
i
x git-inst
a
web breakage on M
a
cOS X
d
u
e to
t
he limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles
B
ailey
Fix
c
lon
e
not to i
g
n
o
r
e
d
e
pth when performing a lo
c
al
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree