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
bash: add support for 'git stash pop --index' option
2009-05-25
Charles B
a
iley
Chan
g
e xdl_merge to gen
e
rate output eve
n
fo
r
null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6
0
2
3
: merge-file f
a
il
s
to output a
n
ything fo
r
a
d
ege
n
e
r
a
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
m
e
rge
t
o
o
l: fix r
u
n
n
i
n
g mer
g
eto
o
l i
n
s
ub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
Bailey
mer
g
eto
o
l:
A
d
d a test for running
mer
g
et
o
o
l in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les
B
ail
e
y
mergetool
:
r
e
s
pect autocrlf by using checkout-i
n
d
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Don
'
t
k
e
ep tempo
r
ary merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Add prompt
t
o c
o
nt
i
nue after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--no
-
promp
t
op
t
ion to mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some tab/s
p
ace inconsis
t
enc
i
es
i
n git-merg
e
to
o
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bail
e
y
git-archive: work in bare rep
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
ile
y
Make git ar
c
hive res
p
ect
c
o
r
e
.
autocrlf when creat
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles B
a
iley
Add new test t
o
d
emon
s
tra
t
e
git arch
i
ve core
.
a
u
t
ocr
l
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
merge-to
o
l docum
e
ntation: describe custom comman
d
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mergetool docu
m
enta
i
to
n
: show tool
n
ames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very basic test s
c
ript for
g
it m
e
rget
o
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
har
l
es Ba
i
ley
T
e
ach git merg
e
tool t
o
use
c
ustom commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles
Bailey
C
han
g
ed an internal
variable of m
e
rgetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
T
i
d
y
up git me
r
getoo
l
'
s b
a
c
k
u
p
file behavi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charle
s
Bail
e
y
g
itk:
F
i
x
the Make
f
i
l
e
to c
o
pe
w
ith s
y
st
e
ms
l
a
cking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove old ge
n
erate
d
files from
.
gi
t
ignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
F
ix git-instaweb breakage on MacOS
X due to t
h
e l
i
mited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Baile
y
Fix clone no
t
to
ign
o
re depth
whe
n
performing a
l
ocal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree