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
ai
l
e
y
tests:
don't rel
y
on st
r
error text when testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles
B
ailey
dir
.
c: make git_
f
n
m
a
t
ch() no
t
inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Ch
a
rles Ba
i
l
ey
mergetool: Remove exp
l
i
cit references to /dev/
t
ty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bai
l
e
y
stash tests: st
a
sh can lose
data in
a f
i
l
e rem
o
ved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
stash:
Don't overwrite fi
l
es that ha
v
e
g
one fr
o
m
t
he
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles B
a
iley
Do
c
umentation: Describ
e
ot
h
er situat
i
ons where -
z
a
f
f
ects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s
Bai
l
ey
Change xdl_merge to gen
e
ra
t
e
o
utput even for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles
Bail
e
y
t6
0
23: merge-file fails to outp
u
t
a
nything for
a
degenera
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
B
ai
l
ey
mergetool:
f
ix running
merg
e
t
o
o
l
in
sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Baile
y
mergeto
o
l: Add a test fo
r
running mergetool i
n
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
a
rles Bailey
mergetool: respect au
t
ocrlf by using c
h
ec
k
out
-
index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s Bail
e
y
mergetool: Don't keep tempor
a
ry merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Char
l
e
s
Bailey
merget
o
o
l
: Add prompt to
continue af
t
er fa
i
ling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s
Ba
i
ley
Add -y/-
-
no-prompt opt
i
o
n
to me
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
r
l
es
Ba
i
l
ey
Fix some
tab/space
inconsi
s
tenci
e
s
in git-me
r
getoo
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
Bailey
g
it-arch
i
ve: w
o
rk in
b
are repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es Bailey
Make g
i
t archiv
e
r
espect
c
o
r
e
.
autocrlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add new
t
est to
d
e
mo
n
strate g
i
t archive cor
e
.
auto
c
rlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
merge-too
l
docum
e
ntation: descri
b
e cus
t
om com
m
and usag
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles Bai
l
ey
git-
m
erge
t
ool documentaiton
:
show t
o
oln
a
mes
i
n typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
r
les Bailey
Add a very basic test
s
cript for g
i
t m
e
rgeto
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
T
e
ach g
i
t mergeto
o
l to use cus
t
o
m comma
n
ds
d
efin
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an internal varia
b
le
o
f mergetool t
o
su
p
port
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Ti
d
y up
g
it mer
g
etool's backup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Ch
a
rles Bailey
gitk: Fix the Makefile
to cope
with
system
s
lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Ch
a
rles Bailey
Remo
v
e old gene
r
at
e
d files from
.
g
it
i
g
nore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harles Bailey
Fi
x
g
it-instaweb br
e
akage on MacOS X due to the l
i
mit
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
ar
l
es B
a
iley
Fix clone not to ignore depth
when perform
i
ng a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree