repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
stash tests: stash can lose data in a file removed from the index
2010-04-20
Charles B
a
iley
stash te
s
ts: st
a
sh c
a
n lose data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charle
s
Bailey
s
tash: Don'
t
overwrit
e
files that
have gone from
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles Bai
l
ey
Change
x
dl_merge to
ge
n
erate output ev
e
n for
n
ull
m
erges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: merge-
f
ile f
a
ils to out
p
ut
anything f
o
r a de
g
enerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
le
s
Baile
y
m
e
rget
o
ol: fix runn
i
ng
mergetool
i
n su
b
-di
r
ecto
r
i
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
me
r
getool: Add a
t
est
f
or ru
n
ning mergetool
i
n
a s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les Ba
i
ley
mergetool: r
e
spect autoc
r
lf
by using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s
Ba
i
l
e
y
me
r
g
etool:
D
o
n't keep temporary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
a
r
les B
a
i
l
ey
merget
o
ol: Add prompt t
o
continue aft
e
r
fa
i
lin
g
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
rles
Bailey
Add -y/--
n
o
-
pr
o
mpt
o
p
t
ion to merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Bailey
Fix some
tab/space inconsi
s
tencies in git-mer
g
etool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
gi
t
-
archive: work in bare rep
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es Bai
l
ey
Make g
i
t archive respec
t
core
.
autocr
l
f when
c
re
a
tin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add new tes
t
to demonstrate git archive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles
B
a
i
ley
merge-tool documentati
o
n: d
e
scribe custom command
u
s
age
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les
B
ailey
git-mergetool do
c
umentaiton: show toolnames in t
y
pewri
t
er
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Add a ve
r
y b
a
sic test
scri
p
t for
g
it merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Ba
i
ley
Teach git merge
t
o
ol to use custom 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 mergetool t
o
supp
o
rt
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tid
y
up git mer
g
etool's b
a
c
kup file
b
e
h
aviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bail
e
y
g
itk: Fix the Makefile t
o
cope
with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bai
l
ey
Remove old genera
t
ed
f
i
les from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles B
a
i
l
e
y
Fix git
-
inst
a
web b
r
eakage on
MacOS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arles B
a
iley
Fix
clone not to igno
r
e
d
e
p
t
h when perfor
m
ing
a l
o
cal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree