repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ld/discovery-limit-to-fs' (early part)
2010-04-18
Charles Bailey
Doc
u
mentation:
Describe other situ
a
t
i
o
ns where -z
a
f
f
ects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ailey
Change
xdl_merge to generate outp
u
t
even for
n
u
ll merge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rl
e
s Bailey
t6023:
mer
g
e-
f
ile
fails to output anything f
o
r a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles Bailey
mer
g
etool
:
fix ru
n
n
i
ng merget
o
ol in sub-directorie
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harles Ba
i
l
ey
mergetoo
l
: Add
a
test for run
n
ing merget
o
ol in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
me
r
getool:
respect autocrlf by
usin
g
ch
e
ckout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Baile
y
mergeto
o
l: D
o
n't
kee
p
t
empor
a
ry merge fi
l
es u
n
less
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mer
g
etool:
Add p
r
ompt to continue af
t
er failing
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
les Bai
l
ey
A
d
d
-
y/
-
-no-prom
p
t option to me
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bai
l
ey
F
i
x some
t
ab/space i
n
consistencies in
g
it-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles B
a
iley
gi
t
-archive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make g
i
t archive r
e
spect core
.
auto
c
rlf
w
hen creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
iley
A
dd new test t
o
demonstrate g
i
t archive core
.
autocrl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
r
l
es Ba
i
ley
merge-too
l
documentation: describ
e
c
ustom co
m
m
a
nd usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles
Bailey
g
it
-
mergetool documentaiton: show tool
n
am
e
s
in typew
r
iter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Ba
i
ley
Ad
d
a very bas
i
c test script for git mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
T
e
ach git m
e
rgetool t
o
use c
u
stom commands
d
efined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
aile
y
Changed an i
n
ternal variable
o
f mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
T
i
dy
u
p git merge
t
ool's back
u
p file behavio
u
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Baile
y
gitk
:
Fix
the Makefile to cope
with systems
l
acking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
ar
l
es Bailey
Remove old gener
a
te
d
files
f
rom
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Cha
r
le
s
Bail
e
y
Fix gi
t
-i
n
staweb breakage on
M
a
cOS X due to the limite
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Ch
a
rle
s
Bailey
Fix clone not to
i
gno
r
e
d
epth when perf
o
rm
i
n
g a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree