repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'tf/maint-doc-push'
2014-07-21
C
harles Bailey
Fix contrib/subtree Mak
e
file to pa
t
ch #! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles
Ba
i
ley
filter-branch: eliminate dup
l
ic
a
te m
a
pped pa
r
ents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Cha
r
le
s
Bailey
com
p
at/bswap
.
h: d
e
tect endianness on more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Cha
r
les
Baile
y
tests: don't rely on st
r
e
rror text when test
i
ng rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles
B
ai
l
ey
dir
.
c: make git_fnmatch
(
)
n
ot inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergetool:
Remo
v
e e
x
plicit
r
eferences to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Cha
r
les Baile
y
stash te
s
ts: stash can lose data in a fi
l
e
removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
l
e
s
Bail
e
y
sta
s
h: Don't overwrite files that have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
a
r
l
es
B
ailey
D
o
cu
m
entation: D
e
scribe other
s
i
tuat
i
on
s
w
h
ere -z
affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es Bailey
Chang
e
xdl
_
mer
g
e t
o
generate output e
v
en for null
m
e
rge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
le
s
Bai
l
ey
t
6
02
3
: merge-file fai
l
s t
o
o
utput a
n
ything for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Ba
i
l
e
y
mergeto
o
l: fix
runn
i
ng
m
ergetool in sub-dire
c
to
r
ies
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Baile
y
mergetool: Add a
test for runni
n
g mergetool in
a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles
B
a
i
ley
mergetool: respec
t
aut
o
crlf by usi
n
g checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool:
Don't
keep temporary merg
e
files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
les
Bailey
merge
t
ool:
A
dd prompt to continue af
t
e
r
failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
A
dd -y/--no-pr
o
m
p
t opti
o
n to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Bailey
F
i
x s
o
me tab/space inconsistencies in git-merget
o
o
l
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-archive: work in b
a
re repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
M
a
ke git
a
rchive re
s
pect core
.
autocrlf whe
n
cr
e
ating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
harles Bailey
Add
n
ew tes
t
to demonst
r
ate git arch
i
ve core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
m
e
r
g
e
-
tool documentatio
n
: describe custo
m
command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rle
s
Bailey
git-mergetool documenta
i
ton
:
sho
w
tool
n
ames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a v
e
ry ba
s
ic test scrip
t
for
g
i
t mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
T
e
ach
git mergetool
to use custom com
m
a
n
ds define
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Baile
y
Cha
n
ged an inte
r
nal variable
o
f mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
ey
T
i
dy up git mergetool's backup file
b
ehavi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
git
k
: Fix the Makefile to cope with systems la
c
king
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
Remove old genera
t
ed files from
.
giti
g
no
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles
B
a
i
l
ey
Fix gi
t
-instaweb
b
r
eakag
e
on M
a
cOS X due to
t
he limite
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charl
e
s Bai
l
ey
Fix clone
not to ig
n
ore dept
h
when performing
a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree