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
builtin-am: exit with user friendly message on failure
2015-07-17
Charles
B
ail
e
y
u
n
t
racked
:
f
i
x detection of un
a
me(2)
fai
l
ure
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-25
Charl
e
s Bailey
F
ix definition of A
R
RAY_SIZE for non-gcc builds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charl
e
s Bailey
contrib/
s
ubt
r
ee:
small tidy
-
up to test
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Ch
a
rles Bailey
contr
i
b/subtree: f
i
x
bro
k
en &&-chains a
n
d revea
l
e
d
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles Bailey
contrib/subt
r
ee: use ta
b
s c
o
nsitently for indentat
i
on
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Cha
r
le
s
Ba
i
l
e
y
parse-options: move
u
nsigned long opti
o
n
p
ars
i
ng out
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2015-06-22
Charles B
a
il
e
y
te
s
t-parse-optio
n
s:
u
pdate to ha
n
d
l
e
n
egative
int
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
h
a
r
les Bail
e
y
d
i
fft
o
ol: don't assume that de
f
ault sh
i
s
san
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Ch
a
r
l
e
s
Baile
y
mergetool: don't
require
a wo
r
k tree
for --tool-h
e
l
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charles
Ba
i
ley
F
i
x c
o
ntrib/subtree Makefile to patch #
!
li
n
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles B
a
i
le
y
fi
l
ter-
b
ranch: elimina
t
e duplicate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bailey
com
p
a
t
/bswap
.
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
e
l
y on strerror
t
ex
t
w
hen t
e
sting rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles
Ba
i
l
e
y
dir
.
c: make
git_fnmatch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
h
arles
B
a
i
ley
merg
e
tool: Rem
o
ve exp
l
ic
i
t reference
s
to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles
Bailey
stash
t
ests: stash c
a
n lose data in
a
file rem
o
ved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles B
a
i
l
ey
stash: Don't ove
r
write files that have g
o
ne
f
rom the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bail
e
y
Docum
e
n
tation: Describe other situations whe
r
e -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles B
a
iley
Change
x
dl_
m
erg
e
to g
e
ner
a
te output even
f
or null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les Bailey
t6023: mer
g
e-file
fails to output anythin
g
for
a degenerat
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles Ba
i
ley
mergetool: fix r
u
nning mergetool in sub-director
i
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Ba
i
l
e
y
mergetool: Add a t
e
st
f
or runni
n
g mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Ba
i
le
y
mergetool: r
e
s
p
e
c
t autocrlf by using
checko
u
t-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetoo
l
: Don't kee
p
temporar
y
merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s
Bailey
merg
e
tool:
Add
promp
t
to continue after faili
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s Bailey
Add -y/--no-p
r
om
p
t option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix
some tab/spa
c
e
inco
n
siste
n
cies in git-merget
o
o
l
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
B
a
i
ley
git-archive:
w
ork in bare rep
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Ba
i
ley
Make git archiv
e
respect c
o
re
.
autocrlf w
h
en crea
t
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
Bailey
Add new test to demonst
r
a
t
e git
archi
v
e core
.
au
t
ocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles
B
ailey
merg
e
-too
l
docu
m
en
t
ation: describe
c
ustom
c
omm
a
n
d
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Bailey
git-m
e
rgetoo
l
d
o
cumentaiton:
show tooln
a
mes in ty
p
ewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Ba
i
ley
Ad
d
a
v
e
r
y basic test scr
i
pt for git merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
Tea
c
h git me
r
getoo
l
to use c
u
stom commands
d
efined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
ile
y
C
hanged an
i
ntern
a
l v
a
riab
l
e of me
r
g
etool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bai
l
ey
Ti
d
y
u
p
git mer
g
eto
o
l's bac
k
u
p
fi
l
e beha
v
i
our
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk
:
Fix th
e
Makefile to cope with systems lack
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charl
e
s Bailey
Remove
old genera
t
ed files
f
r
om
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Char
l
es Bailey
F
ix
g
it-instaweb brea
k
ag
e
on
Ma
c
OS X due to the l
i
mited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
F
i
x
c
l
o
ne not to
i
g
n
o
re depth w
h
e
n
performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree