repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
diff: clarify textconv interface
2015-06-25
Charles Bail
e
y
Fix d
e
f
i
nition o
f
ARRAY_SIZE for
non-gcc build
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bailey
difftool:
d
o
n't
as
s
ume that default sh
i
s
sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charles Bail
e
y
mergeto
o
l:
d
on'
t
requ
i
re a work t
r
ee for --tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Cha
r
l
e
s
Bailey
Fix
c
o
n
t
r
i
b/subt
r
ee M
a
k
efile to patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
C
h
arles Bailey
f
i
lter-
b
ranch: eliminat
e
duplicate mapped
pa
r
e
n
ts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bail
e
y
compat/bswap
.
h: dete
c
t endiannes
s
on
m
o
re platfo
r
ms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Ba
i
ley
t
e
sts: do
n
't rely
on stre
r
ror text w
h
en testing rm
d
ir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c: make git
_
fnmatch() not
i
nline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergetool: Rem
o
ve
explicit r
e
ferences
t
o /
d
e
v/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Ba
i
ley
stash tests: stash ca
n
l
ose data in a file r
e
moved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bail
e
y
stash:
D
on
'
t o
v
erwrit
e
f
iles that have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charle
s
Bailey
Documentation: De
s
cribe
other situa
t
ions wh
e
re -z af
f
e
c
ts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bail
e
y
Change xdl_m
e
rge to gen
e
rate outp
u
t even for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: merge
-
file fa
i
ls to output
anything fo
r
a
degen
e
rate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merg
e
tool: fix ru
n
ning mergetool in s
u
b
-
directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Ba
i
le
y
m
ergetool:
Add a
t
e
s
t f
o
r running
mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
merge
t
ool: respect
autocrlf
by u
s
ing checkout-i
n
dex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Bailey
mergetoo
l
:
Don't keep temporary mer
g
e files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s
Bailey
mergetool: Add prompt to con
t
i
n
ue afte
r
failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harle
s
Bailey
Ad
d
-y/--no-prompt
o
pti
o
n
to
mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
l
ey
Fix
s
ome tab/
s
pace i
n
con
s
istencies in git-mergetoo
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Cha
r
les Bailey
git-archive:
w
ork in
bare
repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles Bailey
Make git archive
r
es
p
e
c
t core
.
autocrl
f
when creati
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
har
l
es
B
ailey
Ad
d
new test to demonstrate git ar
c
hiv
e
core
.
autoc
r
l
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bail
e
y
merge-
t
ool documentation: describe cus
t
o
m
com
m
and usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
ley
git-mergetool documentaiton:
s
h
ow toolname
s
in
typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s B
a
iley
Add a
v
e
r
y
b
as
i
c
test script
f
or git merg
e
too
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Teach git merg
e
t
o
ol to use
c
u
st
o
m commands
d
efined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
C
ha
n
ged an i
n
ternal variable of mergetool
t
o
sup
p
o
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Tidy up git m
e
rgetool's backu
p
file
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Cha
r
les Bailey
gitk: Fix
t
h
e
Makefile to
c
ope wit
h
systems
lack
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles B
a
il
e
y
R
e
m
o
ve old gene
r
ated files
f
r
om
.
gitig
n
ore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Ch
a
rles Bailey
Fix git-instaweb bre
a
k
age o
n
Mac
O
S X due to
t
h
e limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charle
s
Bailey
Fix clone not to
ignore
dep
t
h when
p
erform
i
ng a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree