repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
do not overwrite files marked "assume unchanged"
2010-04-18
Charle
s
B
a
ile
y
Doc
u
mentation: De
s
cribe other situat
i
ons where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arle
s
Bailey
Ch
a
nge
x
dl_merge to ge
n
e
ra
t
e output even for
n
ull merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Bail
e
y
t6023: mer
g
e-file fails to outpu
t
a
n
ythi
n
g f
o
r a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
Bailey
mergetool: f
i
x run
n
in
g
m
e
rgetool i
n
sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetoo
l
:
A
dd a test for r
u
n
n
ing merget
o
ol
i
n a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Char
l
es
Bailey
mergetool
:
re
s
p
e
ct autocrlf by using check
o
ut-
i
nde
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
ha
r
les
Bailey
merge
t
ool: Don't keep te
m
porary mer
g
e fi
l
es unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetoo
l
: Add
p
rompt to continue af
t
e
r f
a
iling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
rles Bailey
Add -y
/
--no-pr
o
mpt option to
merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some
t
ab/spa
c
e
in
c
onsistenci
e
s in git-merg
e
tool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
B
ailey
git-a
r
chiv
e
: work
i
n bare
r
e
p
os
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles
B
ai
l
ey
Make git archive respect
core
.
au
t
ocr
l
f when crea
t
i
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
Bailey
A
dd new test
to demons
t
rate git archive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
aile
y
merge-too
l
docu
m
entat
i
on:
d
e
s
cr
i
b
e
custom command
u
sage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mer
g
etool
document
a
i
ton: show to
o
l
n
ames i
n
t
ypewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Add a very
b
asic test script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
ley
Teach git me
r
g
etool to use cust
o
m commands defi
n
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an
internal variable of merg
e
tool to
s
upp
o
rt
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Ba
i
l
e
y
Tidy u
p
git merget
o
ol's backup
f
ile beha
v
i
our
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
arles
Ba
i
ley
gitk: Fi
x
the
Makefile
to c
o
pe with systems l
a
cking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
arle
s
Bailey
Re
m
o
ve old
g
enerated files f
r
o
m
.
gi
t
ignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charl
e
s Bailey
Fi
x
git-instaweb brea
k
a
g
e on MacOS
X
d
u
e
to the
limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clone
n
ot to ignore depth when perfo
r
ming a
l
o
c
al
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree