repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'pa/auto-gc-mac-osx' into maint
2015-06-25
Charle
s
Bailey
F
i
x definition of ARRAY_SIZE fo
r
non
-
gcc builds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Ch
a
rles Bailey
difftool
:
d
o
n't assume that default sh is san
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charl
e
s Bai
l
ey
m
ergetoo
l
: don't require a
work tree fo
r
--t
o
ol-
h
elp
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Cha
r
les B
a
i
ley
Fi
x
con
t
rib/subtr
e
e
M
a
kef
i
le to
p
atch #! l
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Ch
a
rles Bail
e
y
filter-br
a
nch: eliminate dupli
c
at
e
mappe
d
parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Cha
r
les B
a
i
l
ey
compat/bswap
.
h: de
t
ect
e
nd
i
anness on more
platfor
m
s
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Cha
r
les Bai
l
e
y
tests: don't rely on strerror text
w
h
en testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Cha
r
les B
a
i
ley
d
ir
.
c: m
a
ke git_f
n
match() not
inlin
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
harles Bailey
mergetool: Re
m
ove explici
t
refere
n
ce
s
t
o /
d
ev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bai
l
ey
stash tests: stash
c
an lose data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bail
e
y
stash: Don'
t
o
ver
w
rite f
i
l
e
s th
a
t
have gone from
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
ar
l
es
Bailey
Documentation:
Describe ot
h
er s
i
tuation
s
where -z affec
t
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es Bai
l
ey
Chan
g
e xdl_merge to generate output even for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rl
e
s
Bailey
t6023: merge
-
file
fail
s
to outp
u
t anything for a deg
e
nerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles B
a
iley
m
er
g
etool: f
i
x running merg
e
tool in
s
ub-d
i
rector
i
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
ha
r
l
es
B
ailey
me
r
getool:
Add
a test for r
u
nning merge
t
ool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
m
e
rgetool: resp
e
ct
a
utocr
l
f b
y
using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
me
r
g
e
tool: D
o
n't keep tempora
r
y me
r
ge
f
iles
u
nles
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
mergetool: Add prompt to
c
ont
i
n
u
e
after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rles Bailey
Add -y/--no-prompt op
t
i
o
n to m
e
rgetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
Fix some tab/spa
c
e
inc
o
nsistencies in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
g
i
t-archive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles Bailey
Make git arc
h
ive r
e
spe
c
t core
.
autocrl
f
w
hen cre
a
ting
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charl
e
s
Bailey
Add new test to demonstrat
e
git archive c
o
re
.
auto
c
r
lf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles
B
ail
e
y
m
e
rg
e
-tool doc
u
menta
t
ion: describe
c
ustom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
g
i
t-me
r
geto
o
l docu
m
entait
o
n: s
h
ow toolnames
in typewr
i
ter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very basic
t
est script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bail
e
y
Teach git mergetool to
u
s
e
custom commands de
f
in
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Changed an internal vari
a
b
l
e
of me
r
getool
to su
p
port
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
i
ley
Tidy up gi
t
merge
t
o
o
l's backup file behav
i
ou
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
arles Bailey
gitk
:
Fix th
e
M
a
ke
f
ile t
o
cope with s
y
stems lacki
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
ha
r
les Bai
l
ey
Rem
o
ve old gener
a
ted fi
l
es from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
F
i
x git-ins
t
aweb breakag
e
on MacOS X d
u
e to the
l
imi
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles
B
ailey
Fi
x
clone not to ignor
e
d
ep
t
h when performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
