repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
subtree: make "all" default target of Makefile
2014-07-21
Charles Ba
i
ley
Fix
c
ontrib/subtree Makef
i
le to patch
#
! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Char
l
e
s
Bailey
filter
-
branch: e
l
imin
a
te dupl
i
c
ate mapped pa
r
en
t
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bailey
compat/bswap
.
h
:
de
t
e
ct en
d
i
an
n
ess on
m
ore platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
h
arles Bailey
t
est
s
: don't
rely on
s
t
r
er
r
or text when t
e
st
i
ng r
m
di
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bail
e
y
dir
.
c: make git_f
n
match()
not in
l
ine
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Ba
i
ley
merge
t
ool: Remove
explicit r
e
fere
n
ces to /d
e
v/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Ch
a
r
les Bailey
stash t
e
s
ts: stas
h
c
a
n
l
ose data i
n
a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bail
e
y
stash: Don't overwrite fi
l
es
that have g
o
ne from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
ha
r
le
s
Bailey
Doc
u
mentation: De
s
cribe other
situatio
n
s w
h
e
re -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Bailey
C
h
ange xdl_m
e
rge to generate output even for null m
e
r
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arl
e
s Ba
i
l
ey
t602
3
: me
r
ge-file
f
ails
t
o output anyt
h
ing for a deg
e
nerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles B
a
iley
mer
g
e
t
o
o
l
: fix runni
n
g mergetool in
su
b
-
directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergeto
o
l
: Add a te
s
t for runn
i
ng mergetoo
l
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
arles Bailey
me
r
g
e
to
o
l: res
p
ect autocrlf by using c
h
eck
o
ut-i
n
dex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Baile
y
merg
e
tool: Do
n
'
t
keep t
e
m
por
a
r
y
merge files unl
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bail
e
y
mergetool
:
Add prom
p
t to co
n
tinue after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s Ba
i
l
e
y
Add -y/--n
o
-prompt optio
n
to mer
g
eto
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
F
ix some tab/space inconsist
e
ncies in g
i
t-me
r
getool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charl
e
s Bailey
git-archive:
w
ork in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charl
e
s Bailey
Mak
e
git archive respect
c
ore
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
ailey
Add ne
w
test t
o
d
emonstrate
git a
r
c
h
ive core
.
autocrl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arl
e
s Bailey
merge-tool documentation: desc
r
i
b
e
c
u
s
tom
command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mergetool
d
ocumentaiton: s
h
ow to
o
ln
a
mes in typew
r
iter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bai
l
ey
Add a very basic test sc
r
ipt fo
r
git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
r
l
e
s Bai
l
e
y
T
e
ach git mer
g
etool
t
o use c
u
stom
c
o
mmands defi
n
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
rles Bailey
Changed a
n
internal variab
l
e
of mergetool to
s
u
p
port
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arl
e
s B
a
il
e
y
Ti
d
y u
p
git mergetool's backup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
a
r
les
B
a
iley
git
k
: F
i
x the Makefil
e
to cope with sy
s
tems
l
ack
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Char
l
es Bailey
Remo
v
e old gen
e
r
ated fil
e
s
from
.
g
i
tignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Cha
r
le
s
Bailey
Fix git-instaweb br
e
akage on MacOS X due
t
o
the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
a
rles
B
ailey
Fix clon
e
n
o
t to i
g
no
r
e d
e
pth
w
hen performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree