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 'mh/fsck-reflog-entries' into maint
2015-06-25
Char
l
e
s
Bailey
F
ix definition
of ARRAY_SIZE fo
r
n
o
n
-gcc build
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
harles Bai
l
ey
d
i
fftool: d
o
n'
t
ass
u
me th
a
t
d
efault sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
mer
g
etool: don't requi
r
e a
w
ork tree for --
t
ool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
h
a
r
les Baile
y
Fix co
n
trib/subt
r
e
e
Mak
e
file to
p
atch #!
line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
C
harles Bailey
fi
l
t
er
-
b
r
anch: eliminate duplicate
mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bail
e
y
com
p
at
/
bs
w
a
p
.
h
: detect e
n
diann
e
ss on mor
e
p
l
a
t
f
orm
s
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Char
l
es Bailey
t
e
s
ts:
do
n
't rely on
s
trer
r
or
text when te
s
tin
g
rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c: make git_fnm
a
tc
h
()
n
o
t i
n
l
ine
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bai
l
ey
mergetool: Remove explicit
r
eference
s
to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
stash tests: stash can lose data i
n
a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
ailey
stas
h
: Don
'
t ov
e
rwrit
e
fi
l
es that have go
n
e from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles
B
ailey
Doc
u
men
t
at
i
on: Describe
o
ther situatio
n
s
whe
r
e
-
z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change
x
dl_merge to
g
e
nerate outp
u
t even fo
r
null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles B
a
iley
t60
2
3: me
r
ge-file fails to output anything for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
Bailey
me
r
getoo
l
: fix
runnin
g
merge
t
o
o
l in sub-direc
t
ori
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merg
e
tool: Ad
d
a
test f
o
r run
n
i
ng
m
ergetool in a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les B
a
iley
mergetool
:
re
s
pect autoc
r
lf by using
checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bail
e
y
m
erg
e
tool: Do
n
'
t keep temporary merg
e
files un
l
ess
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
m
ergetool:
Add
p
rom
p
t to cont
i
n
ue aft
e
r failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
Bai
l
ey
Ad
d
-y/--no-prompt option
to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
ar
l
es Bail
e
y
Fix some
ta
b
/space inconsistenci
e
s in git-mer
g
etoo
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles B
a
i
l
e
y
git-
a
rchive: wor
k
in bare r
e
pos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
iley
Ma
k
e git ar
c
hive respect c
o
re
.
auto
c
rlf when creating
.
.
.
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 ar
c
h
ive
core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
Bailey
merge-tool documentation: describe
cus
t
om comman
d
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
ha
r
l
e
s Bailey
git-merg
e
tool
d
o
cumenta
i
ton: show to
o
lnames in
typ
e
writer
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
i
ley
Add a very basic test script f
o
r git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Baile
y
T
each git merg
e
tool t
o
use cust
o
m
command
s
de
f
i
ne
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arl
e
s Bailey
Changed an intern
a
l var
i
abl
e
of m
e
rg
e
tool to suppo
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
rles Ba
i
l
e
y
Tid
y
up gi
t
m
e
rgetool's backu
p
file beha
v
i
ou
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bai
l
e
y
gitk: Fi
x
the Makefile
to
c
ope with sy
s
te
m
s lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove ol
d
generated files from
.
g
i
tign
o
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles
Bailey
Fix git-instaweb bre
a
kage on M
a
cOS X due to
t
he lim
i
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
F
i
x cl
o
ne not t
o
ign
o
re depth when pe
r
for
m
ing
a
loc
a
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree