repo.or.cz
/
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 'jk/gitweb-with-newer-cgi-multi-param'
2014-10-15
Charles Bai
l
ey
d
if
f
tool: don't ass
u
m
e that d
e
fault sh i
s
sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
h
arle
s
Bailey
mergetoo
l
: don't req
u
ir
e
a work
t
ree
f
or --to
o
l-hel
p
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
h
arles
Bai
l
ey
F
ix
c
ontrib/
s
ubtree Makefile to patch
#
! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles
B
a
i
ley
filter-branch: eliminate duplicate map
p
ed pa
r
ents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Baile
y
com
p
at/bswap
.
h: detect endiannes
s
on more
p
latforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
h
arles
B
ailey
t
ests: don
'
t re
l
y on strerror text when
t
estin
g
rmdi
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles Bailey
dir
.
c: mak
e
gi
t
_fnmatch(
)
not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Ba
i
ley
mergetool: Rem
o
v
e
explicit
references
to
/
dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Char
l
es Bailey
stash
t
es
t
s:
stash
can lo
s
e
data in
a
fi
l
e
r
e
m
oved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
ailey
stash: Don't
o
v
erw
r
ite files that
h
av
e
gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Documentation:
D
escribe other situation
s
where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Ba
i
ley
Change xdl_me
r
ge to
g
enerat
e
ou
t
put even for null mer
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ai
l
ey
t60
2
3:
m
erge-
f
ile fails to output
a
nything
for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Ba
i
ley
mergetool: fix
runn
i
ng mer
g
etool in
sub-directorie
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
me
r
g
etool
:
A
dd a t
e
st for running mer
g
etool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les Bai
l
ey
mergetool: respect autocr
l
f by using
c
heckout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
ey
mergetool: Don't
k
e
e
p
te
m
pora
r
y
merge
files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
a
rles Bai
l
e
y
mergetool: Add
promp
t
to cont
i
nue af
t
er
f
ailing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rl
e
s Bailey
Add -y/
-
-n
o
-prompt option to mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix
some tab/space incons
i
stencies in git-merg
e
t
ool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
r
les Bailey
git-archiv
e
:
wo
r
k in bare repo
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Ma
k
e g
i
t a
r
chiv
e
respect
cor
e
.
autocrlf when creat
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
ile
y
Add new test to demonstrat
e
git a
r
chive
core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool documen
t
ation: d
e
scribe
custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
har
l
es Ba
i
ley
git-m
e
rgetool
d
ocumenta
i
ton: show toolnames in type
w
riter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
r
l
es Bailey
A
dd a very bas
i
c test script for
g
i
t
merget
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Teach g
i
t
m
ergetool to us
e
custom com
m
ands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Baile
y
Changed
a
n i
n
te
r
nal
vari
a
ble of mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Ba
i
ley
Tidy
u
p git
m
e
r
getool's backup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
harles Bai
l
ey
gitk: Fix the M
a
kefile to
c
ope
w
ith s
y
stems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Ba
i
ley
R
emove old gene
r
ated files from
.
gitig
n
ore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Char
l
es Baile
y
Fix git-insta
w
eb br
e
a
k
a
ge on
M
acOS
X due
t
o
the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Cha
r
l
es Baile
y
Fi
x
c
lone
not to i
g
nore depth wh
e
n
performing
a
l
ocal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree