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
test-parse-options: update to handle negative ints
2015-06-22
Charle
s
Bail
e
y
test-pars
e
-
o
p
tions:
upd
a
te to h
a
nd
l
e negative ints
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Char
l
es Bailey
difftool:
don't
assume that
defau
l
t sh is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
h
a
rles
B
ai
l
ey
mergeto
o
l: don't require
a
work tree f
o
r --tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
Ch
a
rles
B
ailey
Fi
x
contr
i
b/subtree Makefil
e
to patch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
filter
-
branch:
e
l
iminate dupli
c
a
t
e
m
apped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Char
l
es Bailey
compa
t
/bswap
.
h: detect endianness on more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
tests: don
'
t rel
y
on strerror t
e
xt when testin
g
r
m
d
ir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c: mak
e
git_fnmat
c
h()
n
ot in
l
ine
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Char
l
es
Bailey
mergetool:
Remove explicit re
f
e
rences to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
stash te
s
ts: stash can lose
d
a
t
a in
a
file r
e
mov
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
Bailey
stash: Do
n
't overwrit
e
file
s
th
a
t
h
a
v
e
g
on
e
from
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Char
l
es
B
ai
l
ey
Docume
n
tation:
D
escr
i
b
e
other
s
ituations where -z af
f
ect
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xdl_merge to generate
outp
u
t even for null
m
e
r
ges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Baile
y
t6023
:
m
erge-file fails to output
anything f
o
r a deg
e
nerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles Bailey
merg
e
tool: fix ru
n
nin
g
mergetool in sub-d
i
rectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
r
les Bailey
merget
o
ol: Add a test fo
r
running mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charle
s
B
a
iley
merge
t
o
o
l: respect
autocrlf by using
c
hec
k
out-i
n
dex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
a
i
l
e
y
mergetool: Don't ke
e
p tempora
r
y merge file
s
unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
merge
t
ool:
A
dd prompt t
o
c
onti
n
ue af
t
er failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -
y
/--no-prompt option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
F
ix s
o
me
tab/space
in
c
onsistencies in git-merge
t
o
o
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
harl
e
s
Bai
l
ey
git-archive
:
work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git archive
r
espe
c
t core
.
autocr
l
f
w
hen c
r
eating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
Bailey
Add new
t
est to demonstrate git arc
h
i
ve
core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles B
a
iley
merge-tool documentatio
n
:
d
e
s
cribe
custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
l
e
s Bailey
git
-
mergeto
o
l documentaiton: sho
w
toolnames
i
n
t
ype
w
rite
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s
B
a
iley
A
dd a very
b
asic
tes
t
script for
g
it mer
g
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Baile
y
Teach git
m
ergetool t
o
use custom co
m
mands def
i
ned
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
i
ley
Ch
a
ng
e
d
a
n internal variable of mergetool to
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Tidy up git mer
g
eto
o
l's bac
k
up
fil
e
behavi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
Bailey
git
k
:
Fix the Makefile to co
p
e with
s
ys
t
e
ms lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Ch
a
r
l
es Bailey
Remove old generated files f
r
o
m
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
ha
r
les
B
ailey
Fix git-instaweb bre
a
kage on MacO
S
X due t
o
the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arles Ba
i
ley
Fix
c
l
o
n
e
not to
ignore de
p
th when perfor
m
ing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree