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
fast-import: Improve robustness when D->F changes provided in wrong order
2010-04-18
C
harles B
a
iley
D
o
cu
m
entation
:
Des
c
ribe other
s
i
tu
a
tions where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
a
rles Bailey
C
han
g
e
x
d
l_merge
t
o ge
n
erate output
even for
nu
l
l merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
a
iley
t6
0
23: merge-file fails to outp
u
t
an
y
t
h
ing
f
o
r
a
de
g
e
ner
a
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s
B
a
il
e
y
mergetool: f
i
x run
n
in
g
merget
o
ol in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool: Add
a
test for running merg
e
tool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charle
s
Baile
y
m
e
rgetoo
l
: respect autocrlf by using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mer
g
e
t
oo
l
: D
o
n't keep tempor
a
ry merge files unl
e
s
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
a
r
l
es
Bailey
mergetool: Add prom
p
t
to continue afte
r
failing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
Add -y/--
n
o-prompt option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles Bailey
Fix so
m
e
tab/space
i
nc
o
nsistencies in gi
t
-mer
g
et
o
ol
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Baile
y
git-ar
c
hive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles Ba
i
ley
Mak
e
g
i
t a
r
c
h
ive r
e
spect core
.
autocrlf when cre
a
ting
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
B
ailey
A
d
d ne
w
te
s
t t
o
demonstrate
git
a
rchive co
r
e
.
autoc
r
l
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
a
r
les Bai
l
ey
merge-tool documentation: desc
r
i
be custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
ailey
git-mergetool documentaiton: show toolnames in t
y
pewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a ver
y
basi
c
test s
c
ript
for
git merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Teach git me
r
g
e
too
l
to use custom command
s
de
f
ined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an internal varia
b
le of mergetool
t
o support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bail
e
y
Tidy up
g
it mergetool
'
s backup fi
l
e behavio
u
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
arle
s
Bail
e
y
gitk: Fix th
e
Makefi
l
e to cope with syst
e
ms lackin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Char
l
e
s
Bailey
Remove old generated
files from
.
gi
t
i
gn
o
re
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charl
e
s Bail
e
y
F
i
x g
i
t-instaweb breakage on Ma
c
OS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charle
s
Bail
e
y
Fix clone not to ignore
d
e
p
th whe
n
per
f
o
r
m
ing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree