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
Merge branch 'bg/fix-t7003'
2010-08-20
Cha
r
les B
a
i
l
e
y
mergetool: Remov
e
explicit re
f
e
r
ences to /dev
/
tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
st
a
s
h
tests: sta
s
h can lose data in
a f
i
le remo
v
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
les Bai
l
ey
s
tash: Don't overwrite
f
il
e
s
t
hat hav
e
gon
e
f
r
o
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
arl
e
s Bailey
Do
c
u
m
entat
i
on: De
s
cr
i
be other situations whe
r
e
-z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les Bai
l
ey
Cha
n
ge xd
l
_merge to gener
a
te output ev
e
n for null
me
r
ges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rles Bailey
t6023
:
merge-file 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
B
a
iley
mer
g
eto
o
l: fix ru
n
n
ing mer
g
etool in
sub-
d
i
rectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles
B
ailey
merg
e
tool: Add a
t
e
st for
runni
n
g mergetool in
a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
merge
t
ool: respect autocrlf by usi
n
g c
h
ec
k
out-i
n
dex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool
:
Don't keep
t
e
m
porary merg
e
files un
l
es
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Add prompt to continue after f
a
i
ling
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
A
d
d -y/--no-prompt option to merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles
Bailey
Fix some tab/space inconsi
s
tencie
s
in g
i
t-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charl
e
s B
a
il
e
y
git-
a
rc
h
ive:
w
ork
i
n bare
r
epos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
i
l
ey
Make
git arc
h
ive respect core
.
au
t
o
c
rlf whe
n
creati
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Baile
y
Add
ne
w
test
to demonstra
t
e git arc
h
ive co
r
e
.
au
t
ocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-tool do
c
ume
n
tation: desc
r
ibe cus
t
om command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Ba
i
l
e
y
git
-
m
e
rgetoo
l
d
o
cum
e
ntaito
n
: show toolnames
in
t
y
pewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Ba
i
ley
Add a
v
e
ry basic te
s
t scri
p
t for g
i
t merg
e
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les
B
ailey
Teach git mergetoo
l
to use custom commands
d
efined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Ba
i
l
e
y
C
h
a
nged an inter
n
a
l
variable of mergetool
t
o s
u
pport
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up git
m
erg
e
to
o
l
'
s backu
p
file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
a
rles Bailey
gi
t
k: Fi
x
the Makefile
t
o cope wi
t
h systems lack
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
a
r
les Bailey
Remove ol
d
ge
n
erated files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
h
arles B
a
iley
Fi
x
g
it-instaweb break
a
ge on MacOS
X
due to
t
he limite
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles B
a
i
l
ey
Fix
clone not to ignor
e
depth when performi
n
g
a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree