repo.or.cz
/
git
/
mingw
/
4msysgit.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 Bail
e
y
Fix contr
i
b
/
subtree Make
f
il
e
to
pat
c
h #!
line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
fil
t
e
r
-branch: eliminate
dup
l
icate mappe
d
parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Ba
i
ley
c
om
p
a
t/
b
sw
a
p
.
h: detect endianness on more
platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles Bailey
tests: d
o
n't
r
ely o
n
strerror text when
testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Baile
y
dir
.
c: ma
k
e
g
i
t_fnmatch() no
t
inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergetool: Remov
e
e
x
p
l
i
c
it references to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles B
a
iley
st
a
sh tests: sta
s
h can l
o
s
e
data in
a fi
l
e
r
emove
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
le
s
Bailey
stas
h
: Don't overwr
i
te
f
i
l
es
t
ha
t
h
ave go
n
e from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
harles Bailey
Document
a
tio
n
: De
s
cr
i
be other situations where -z
affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rles Bail
e
y
Cha
n
ge xdl_me
r
ge to generate output even
f
or
null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es Baile
y
t
6023: m
e
rge-file fa
i
ls to
o
utput any
t
h
i
ng for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Bai
l
e
y
mergetool: fix
running mergetool in sub-dire
c
torie
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s
Bai
l
e
y
mergetool:
A
dd a t
e
st
f
or running me
r
g
etool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
arles Bailey
mergetool
:
resp
e
ct autocrl
f
b
y using checkout-
i
nd
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
m
e
r
getool: Don't keep temporary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Add prompt to contin
u
e
after fa
i
ling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles
Ba
i
ley
Add -y
/
-
-
no-
p
rompt
option to me
r
get
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
Fix
some tab/space inconsistencies in git-merget
o
ol
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
arles Ba
i
ley
g
it-archive: work in bar
e
rep
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les Bailey
Make git archive respect core
.
autocrlf when crea
t
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rl
e
s Bailey
A
d
d n
e
w
t
est to
d
emonst
r
ate git archive
core
.
a
u
tocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es Bailey
m
erge-tool
d
ocum
e
ntation: describe
custom comma
n
d usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-merget
o
ol doc
u
mentaiton: sho
w
toolnames in typ
e
writ
e
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add
a
very
b
a
sic test
s
c
rip
t
f
or
g
it merget
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Teach git
m
ergetool to u
s
e custo
m
c
o
mm
a
nds defin
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles
B
ail
e
y
Chang
e
d
a
n internal variable of m
e
rgeto
o
l
to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Tidy up git merg
e
t
ool
'
s bac
k
up f
i
le beh
a
viour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Baile
y
gitk: Fix the Makefile to cope wit
h
systems lackin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
R
e
move
o
ld generated file
s
from
.
git
i
gnore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Ch
a
rles B
a
iley
F
i
x git-instaweb breaka
g
e on M
a
cOS X d
u
e to
t
he
l
i
m
ited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Ba
i
l
ey
Fix clone
not to ignor
e
de
p
t
h
when performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree