repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jn/maint-doc-user-manual-html-doctype'
2010-08-20
Charles Bailey
me
r
g
etool:
R
em
o
ve e
x
plicit refere
n
ces t
o
/dev
/
tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charl
e
s Baile
y
stas
h
tes
t
s: stash
can los
e
data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles Baile
y
stash: Don't ove
r
write fil
e
s th
a
t
have
g
one fro
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bai
l
ey
Documentation: Describe
o
t
h
er
s
ituations whe
r
e
-z affec
t
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Bail
e
y
Change xdl_merge to genera
t
e output e
v
en for n
u
ll merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
l
es Ba
i
l
e
y
t602
3
: mer
g
e-file fails to ou
t
put anyth
i
ng for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
mergetool: fix running mergetool
i
n sub-dire
c
tories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merget
o
ol: Add a
t
est for running
mer
g
etool
i
n
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
a
r
l
e
s Bailey
mergetool: respect
autocrl
f
by using
checkout-
i
n
d
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Char
l
es Ba
i
ley
m
e
rg
e
tool: D
o
n't keep tem
p
orary mer
g
e
f
ile
s
u
nl
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
merget
o
ol: Add prompt to continue
a
fte
r
f
a
il
i
ng to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
es B
a
iley
Add -y/--
n
o-prom
p
t opt
i
on to
m
ergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Ba
i
ley
Fix some tab/s
p
ace inco
n
si
s
tencies
in git-merget
o
ol
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-
a
rch
i
ve:
w
o
r
k in bare rep
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make g
i
t a
r
c
h
ive
res
p
ect
core
.
autocrlf
when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harle
s
Bailey
Add
new test to demonstrate git archive core
.
auto
c
r
lf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
a
rles Bailey
m
erge-tool documentat
i
on: describe c
u
st
o
m command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
Bailey
git-mergetool d
o
c
umentaiton: show toolnames
i
n
typew
r
iter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bai
l
ey
A
d
d a
v
ery basic test script for git
m
e
rgetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
har
l
es Bailey
Teach
g
it merg
e
tool
to use
custom command
s
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Changed an int
e
r
n
a
l
var
i
abl
e
o
f mer
g
et
o
ol to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
T
idy up git mergetool'
s
b
a
ckup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Ba
i
l
e
y
gitk: Fix the Mak
e
file to cop
e
with
systems l
a
c
king
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
a
r
les Bailey
Remov
e
old generated file
s
f
r
om
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harl
e
s Bailey
F
i
x
git-i
n
staw
e
b breakage on MacOS X
d
ue to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Char
l
es Bailey
Fix
c
lone not to ign
o
re depth when performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree