repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
contrib/subtree: ignore log.date configuration
2015-06-25
Charles
Baile
y
F
i
x
definition of ARRAY_SIZE
for non-gcc builds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Ch
a
rles Bailey
difftool: don'
t
assume th
a
t default sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charl
e
s Bailey
merget
o
ol: don't require a work tree for -
-
too
l
-
h
e
l
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Charle
s
B
ailey
F
ix
contrib/subtree M
a
kefile
to patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charl
e
s
Baile
y
filter-branch: elimi
n
a
te dupl
i
cate ma
p
ped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
ha
r
les
Bailey
c
ompat/bswap
.
h: detec
t
en
d
i
anness
on more pl
a
tfo
r
ms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charl
e
s Bailey
t
est
s
: don't rely on
s
tr
e
rror text when testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charle
s
Bailey
d
i
r
.
c
:
make git_fnm
a
tch()
n
ot inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charle
s
Bai
l
ey
merget
o
o
l: Remove expli
c
it refere
n
ces
t
o /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Char
l
e
s Baile
y
s
tas
h
tes
t
s: stash can l
o
s
e
dat
a
in
a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bail
e
y
stash:
D
on't overwrite f
i
les that have g
o
n
e f
r
om
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charle
s
Bailey
Documentation
:
Descri
b
e o
t
her
s
ituati
o
ns
where -z aff
e
cts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xdl_
m
erge to
generate o
u
tput even for null mer
g
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles Bai
l
ey
t6023: me
r
g
e
-file fai
l
s to out
p
ut a
n
ything
f
or a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harles
Bailey
m
e
rgetool: fi
x
runni
n
g mergetool i
n
sub-dir
e
cto
r
ies
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bail
e
y
mergetool: Add a test f
o
r run
n
ing merge
t
o
ol in
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
ar
l
es Bailey
mergetool: respect aut
o
crlf by using c
h
eckout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bail
e
y
mergeto
o
l:
D
on't keep
te
m
por
a
ry merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
me
r
getool
:
A
d
d prompt t
o
continu
e
after fail
i
ng to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bailey
A
d
d -y
/
--no-prompt
op
t
ion to m
e
rget
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
le
y
Fix some tab/space in
c
ons
i
stencies
i
n git-me
r
g
e
tool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bai
l
ey
git-archiv
e
: work in ba
r
e repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
har
l
es
Bailey
M
a
ke git
a
rchive respect core
.
a
utocrlf wh
e
n creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les
Bailey
A
dd new test to demonstrate git archive core
.
a
u
t
ocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
e
s
B
a
iley
merge-tool documentation: describe custom command
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Baile
y
git-mergetool docum
e
ntaiton:
s
how toolnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Ba
i
le
y
Add
a very basic test script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Baile
y
Te
a
c
h
git me
r
getool
to u
s
e
custom comma
n
ds def
i
ned
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
il
e
y
C
hanged a
n
internal variabl
e
o
f
merge
t
ool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
Ti
d
y up
git mergetool's backup
f
ile
b
ehavio
u
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Ba
i
ley
gitk:
Fix the
Makefile to co
p
e with s
y
stems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove
ol
d
gen
e
rated file
s
from
.
g
i
t
i
gnore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Ch
a
rles Baile
y
Fix git
-
i
n
staw
e
b
b
reakage on MacO
S
X du
e
to
t
he limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
a
r
les Bail
e
y
Fix clone no
t
to ignore depth
w
hen perform
i
ng a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree