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
MinGW: disable legacy encoding tests
2014-07-01
C
h
arles B
a
iley
filter-br
a
nch: elimi
n
ate duplicate mappe
d
pare
n
ts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bailey
compat/bsw
a
p
.
h
:
detect endianness on more pla
t
f
orm
s
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles Ba
i
ley
tests: don't rely on
s
t
r
err
o
r text when testing r
m
dir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bail
e
y
d
ir
.
c: make git_fnmatch()
no
t
inlin
e
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
m
ergetool:
Remove ex
p
li
c
it references
to /dev/t
t
y
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles
B
ailey
stash
tes
t
s: stas
h
can lose data in a
f
i
l
e
removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles Bailey
stash: Don't overwrite f
i
les
t
hat have gone fro
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
a
rles Bailey
Documentat
i
o
n
: De
s
cribe ot
h
er situations
where -z affect
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les Bailey
C
hange xd
l
_merge to generate
output e
v
en for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Baile
y
t6023:
m
e
rge-
f
ile f
a
ils to outp
u
t anything f
o
r a
degener
a
te
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
Bailey
merget
o
ol: fi
x
runnin
g
mergetoo
l
in su
b
-directori
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Baile
y
mer
g
etool: Ad
d
a test for
r
unning mergetool
i
n a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
harles Bailey
me
r
getool: respect autocrlf by u
s
i
ng checkout-inde
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
Ba
i
ley
me
r
getoo
l
: Don't keep
t
e
mpo
r
ary merg
e
files
unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Add prompt
to continue a
f
ter f
a
iling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles Bai
l
ey
Add -y/--no-prom
p
t
option
t
o merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
es Bailey
F
i
x some tab/space inconsist
e
ncies in gi
t
-merge
t
ool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git
-
arc
h
i
v
e:
w
ork in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Ma
k
e git archive respe
c
t core
.
autocrlf wh
e
n creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
ha
r
les B
a
iley
A
d
d new t
e
st to demonstrate
g
i
t archive
c
or
e
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
iley
merge-tool doc
u
mentation: describe custom co
m
mand
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bailey
git-
m
er
g
etool documentaiton: sh
o
w
toolnames in ty
p
ewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very basic test s
c
ript for git
mergeto
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach g
i
t m
e
rgetool to use custo
m
commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Ch
a
ng
e
d an internal variable of merg
e
tool to supp
o
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tid
y
up git
m
e
rgetool's backup f
i
l
e
b
e
ha
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
harles
Bail
e
y
git
k
: Fix the Makefile to co
p
e with
syst
e
ms lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charle
s
Bail
e
y
Remove old gene
r
ated files fr
o
m
.
g
i
tigno
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Char
l
es Bailey
Fix git
-
ins
t
a
w
eb
b
reakage on
M
acOS X due to the
limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bail
e
y
Fix clone not
to ignore
depth when
performing a loca
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree