repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
attribute: whitespace set to true detects all errors known to git
2009-05-25
C
harles
Bailey
Change
x
dl_merge t
o
gener
a
te
output even for n
u
ll m
e
r
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Bailey
t6023: merge-file fai
l
s t
o
output anyt
h
ing
f
or
a
d
egenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
Bailey
me
r
getool: fix running mergetool in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles B
a
iley
m
e
r
g
etool: Add a test
f
or running mergetool
i
n
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charl
e
s Bailey
mer
g
etool: res
p
ect autocrl
f
by
using checko
u
t
-
index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Bailey
m
e
rget
o
ol: Don't
k
ee
p
tem
p
orar
y
mer
g
e files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Char
l
es Bail
e
y
m
e
rgetoo
l
: A
d
d promp
t
t
o
continue af
t
er fai
l
i
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
e
s Bai
l
ey
Add -y/
-
-
n
o-prompt
optio
n
to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
rle
s
Bai
l
ey
F
i
x some tab/s
p
ace inc
o
nsis
t
encies in git-merge
t
ool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
rles Baile
y
git-arch
i
ve: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bai
l
ey
Make git
arc
h
ive respect core
.
autocrlf when cre
a
ti
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charl
e
s Bailey
Add ne
w
tes
t
to demonstrate
g
it a
r
chive
core
.
a
u
t
ocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
l
e
y
m
erge-too
l
documentation: des
c
ribe custom com
m
and usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Baile
y
git-mergetool
d
ocume
n
taiton: sho
w
to
o
ln
a
mes in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Ad
d
a
very basic test
s
c
r
ipt for git
m
erg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles
Bailey
Teach git me
r
getoo
l
t
o
use custom commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
r
les Bailey
Changed an inte
r
n
a
l variable of mer
g
etool t
o
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up git
m
ergetool's backup
fil
e
b
e
h
a
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
g
i
tk: Fi
x
t
he
Makefile to cope with syste
m
s lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Cha
r
les Bailey
Remov
e
old generated
f
ile
s
from
.
git
i
gn
o
re
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Cha
r
les Bailey
Fix git-instaweb
b
reakage
o
n MacOS X due
t
o the
l
i
m
i
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Baile
y
Fix clone not to igno
r
e depth when performing a loca
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree