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
builtin-am: implement -u/--utf8
2015-07-17
Cha
r
les
Bailey
u
n
tracked:
f
ix detection of uname(2)
failure
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-25
Charles
B
ailey
Fix
d
efinition
o
f ARRAY
_
SIZ
E
for non
-
g
cc builds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
C
harles Bai
l
e
y
contrib/
s
ubtree: small tidy-up to test
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
c
o
ntrib/s
u
b
tree: fix broken &&-chains
a
nd
revealed
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Ba
i
ley
contrib
/
subt
r
ee: u
s
e tabs c
o
nsit
e
ntly
f
or ind
e
nta
t
ion
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
parse-options
:
move unsigned l
o
n
g option parsing o
u
t
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Ch
a
r
l
es Bailey
test-parse-option
s
: upd
a
te to handle n
e
g
ative ints
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Cha
r
les Bailey
difftool: don't assume that
defa
u
l
t
sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charle
s
Baile
y
mergetool:
d
on't require
a
w
ork tre
e
for --
t
ool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles
Bailey
Fix contrib/subtre
e
Makefile to patch
#
!
line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
filt
e
r
-
branch: eliminate duplicate mapped p
a
rents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Ch
a
rles Ba
i
ley
c
o
mpat/b
s
wap
.
h: d
e
tect endi
a
nne
s
s on mor
e
pl
a
tforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
t
ests: d
o
n't re
l
y
on str
e
r
ror text when testing
rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c: make git_fnma
t
ch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergeto
o
l:
R
em
o
ve exp
l
icit
references to /d
e
v/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
h
arles Bailey
stash tests: stash can l
o
se data in
a
file
remove
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles B
a
iley
stash: Don't
o
verwrite fi
l
es
that have gone from t
h
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Docu
m
entation:
D
escri
b
e
other
situations where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles B
a
iley
C
hange
xdl
_
merge
to generate output eve
n
for null
merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
l
es Bailey
t6023: merge-file fai
l
s to
output a
n
ything f
o
r
a
d
egenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Baile
y
merget
o
ol: fi
x
runn
i
n
g
mergetool in
s
ub-directorie
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harle
s
Bailey
m
er
g
etool: Add a
t
es
t
f
o
r running mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
mer
g
etool: r
e
spec
t
aut
o
crlf
by using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
les Ba
i
l
e
y
merge
t
ool: D
o
n't k
e
ep
t
empo
r
ary mer
g
e fil
e
s
u
nless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool:
Add prompt to
c
ontinue
after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rles Bai
l
ey
Add -y/--no-pr
o
m
p
t
o
p
t
ion to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
l
e
s
B
ailey
Fix some tab/
s
p
a
ce inconsis
t
encies
in git-merge
t
ool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Char
l
es
B
ailey
git-archive: work in
b
are repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Mak
e
g
i
t arc
h
iv
e
respect core
.
autocrlf when c
r
eating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
A
dd n
e
w test
to demonstrate git ar
c
h
ive core
.
autocrl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool d
o
c
u
mentation: describe custom command
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bailey
g
i
t-
m
ergetoo
l
documentaiton: show toolnames in typewri
t
er
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Baile
y
Add
a
v
ery bas
i
c test scr
i
pt f
o
r git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bail
e
y
Teach git mergetool to use custom commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
rles
B
ailey
C
h
a
nged an i
n
ternal variable of
mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up git me
r
getool's backup file beha
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
B
ailey
gitk: Fix t
h
e Ma
k
efile to cope with systems l
a
c
k
i
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bai
l
ey
Remov
e
old g
e
nerated files from
.
gitigno
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charl
e
s Bailey
Fix git-instaw
e
b breakage
o
n MacOS X du
e
to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles
Bailey
Fi
x
clone not to
i
gnore depth wh
e
n p
e
rforming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree