repo.or.cz
/
git
/
kirr.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
grep: use REG_STARTEND for all matching if available
2010-04-18
Char
l
es Bail
e
y
Doc
u
ment
a
ti
o
n: Describe
o
the
r
sit
u
atio
n
s where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
C
hange xdl_m
e
rge to
generate
outpu
t
ev
e
n for null m
e
rges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bail
e
y
t6023: merge-
f
ile
f
a
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
me
r
g
et
o
ol
:
fix
r
unnin
g
merg
e
tool in sub-directori
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Baile
y
m
e
r
g
etool: Add a test
for
runnin
g
mer
g
etool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
me
r
getool: res
p
e
c
t autocrlf by using checkout-
i
nd
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
a
rles
B
ail
e
y
merg
e
tool: Don't keep
temporary m
e
r
ge files
u
nless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
a
r
les Bailey
me
r
getool: Ad
d
prom
p
t to continue
a
fter failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/-
-
no
-
pr
o
mpt opt
i
on to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bai
l
ey
F
ix some tab/space
inconsistencies in git-merg
e
to
o
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
h
arles Bailey
git-arch
i
v
e: work in bare
repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles
B
ailey
Make git arc
h
ive res
p
ect core
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
e
s
Bailey
Add new test to demonstrat
e
git a
r
chive core
.
autocrl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
Bailey
merge-tool docu
m
enta
t
ion: d
e
scri
b
e custom comman
d
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
le
y
g
i
t
-
mergetool docu
m
entaiton: show
t
oolname
s
in typewrit
e
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very basic test script
f
or git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es B
a
iley
T
e
a
ch git m
e
rget
o
ol
to use c
u
stom
comm
a
nds defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
l
ey
Changed
a
n
i
nternal va
r
iable of merg
e
t
o
o
l to
supp
o
rt
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
Tidy up git mergetool's b
a
ck
u
p file beha
v
i
our
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charle
s
Bailey
gitk: Fix
t
he Makefile
t
o cope w
i
th sy
s
tems lack
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles B
a
iley
Remove old gene
r
ated files fro
m
.
g
i
t
i
g
n
o
re
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
h
a
rles
B
ailey
Fix gi
t
-
inst
a
web br
e
aka
g
e on
MacOS X due to
t
he
limite
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arles Bailey
Fix clone not to ignore
d
epth when performing
a
lo
c
al
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree