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
Update draft release notes to 2.0
2014-03-31
Charles B
a
iley
t
e
s
ts: don't rely on strerror tex
t
wh
e
n
t
estin
g
rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Char
l
es
B
ailey
d
ir
.
c: make git_fnmatch(
)
not i
n
l
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charle
s
Ba
i
ley
mergetool: Remove explicit refer
e
nces to
/dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Ch
a
rles Bailey
stash tests:
s
tash can lose
dat
a
in
a file
r
emov
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Char
l
es Bailey
stash: D
o
n't
over
w
rite files
that hav
e
gone f
r
om th
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Docu
m
entation: Describe other situatio
n
s where -z a
f
f
e
cts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Baile
y
Change xdl_merg
e
to gene
r
ate output
e
v
en for null m
e
rges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: me
r
ge-file fails to
o
ut
p
ut
anything for
a
degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Ba
i
ley
mergetool
:
fix
r
unning me
r
get
o
ol in sub-directori
e
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merg
e
too
l
: Add a test for runnin
g
m
e
rgetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
mergetool: r
e
sp
e
ct autocrlf by
u
sing chec
k
out-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Don't keep tempo
r
ary merge files
u
n
l
ess
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergeto
o
l: Add pro
m
p
t to co
n
tinue after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
r
les Bailey
Add
-
y/--n
o
-prompt optio
n
t
o
m
e
rgetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
Bai
l
ey
Fix some t
a
b
/space incons
i
stenci
e
s
i
n git-mergetool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
B
ailey
git-archive:
work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
Bailey
Make git ar
c
h
i
ve respect core
.
autocrlf wh
e
n creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
Bailey
Add new test
t
o
demonstrate g
i
t ar
c
hive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles Bailey
merge-too
l
documentati
o
n: describe custom comm
a
nd usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles Bail
e
y
git-mergetool documentaiton: show
t
o
o
lnames
in ty
p
ewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Baile
y
Add
a very basic
t
est script f
o
r
git mergeto
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
T
e
a
ch git m
e
rget
o
ol to
use c
u
s
tom
commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
ey
Ch
a
nged an internal vari
a
ble o
f
me
r
get
o
o
l to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles
B
ailey
T
i
d
y
up g
i
t mergetool'
s
backup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
arles Bai
l
ey
gi
t
k: F
i
x the Makefile t
o
cope with systems
l
a
cking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Cha
r
l
e
s Bailey
Rem
o
ve old generated files from
.
g
i
tigno
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Ch
a
rles Bailey
Fix
g
it-i
n
stawe
b
breakage on Ma
c
OS X
due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
harles
B
a
i
ley
Fix clone not to ignore
d
epth whe
n
performing
a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree