repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/tag-sort'
2014-07-21
Cha
r
les Bailey
Fix co
n
trib/subtree Mak
e
f
i
le
t
o patc
h
#! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
fi
l
ter-branch: elimin
a
te dupl
i
cate mapped p
a
re
n
ts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charl
e
s Bailey
compa
t
/bswap
.
h: de
t
ect endianness on more pla
t
forms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
h
arles Bailey
test
s
:
don't r
e
ly on strerror text w
h
en
t
est
i
ng
r
m
d
ir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
d
ir
.
c
: make g
i
t_
f
nmatch()
not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
h
arles B
a
il
e
y
mer
g
etool: Remove
exp
l
ici
t
refere
n
ces to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles
B
ailey
stash
te
s
ts: stash can lose data in
a
f
i
le removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Char
l
es Bailey
stash: Don'
t
o
v
e
rwrite files that have gone from
th
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
r
les Ba
i
ley
Docu
m
e
ntatio
n
: Describe ot
h
er situations
w
h
ere -z
affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles
Ba
i
ley
Chan
g
e xdl_
m
erge to gen
e
rate output even f
o
r
n
ull merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t602
3
: m
e
rge-file fails
t
o
output
a
nything for a degen
e
r
ate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
e
s
Baile
y
me
r
getool: fix running merget
o
ol in sub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Baile
y
merge
t
ool
:
Add a t
e
st for
r
u
nning mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bai
l
ey
mergetool: r
e
spe
c
t
a
utocrl
f
by
u
sing checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
les Bailey
merget
o
ol: Don't keep tempor
a
r
y merge
f
ile
s
unle
s
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
ey
mergetool: Add prompt to co
n
t
i
nue after failing
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
Bailey
Add -y/--no-prompt option to merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harl
e
s Bailey
Fix some tab/space in
c
onsi
s
t
enci
e
s in git
-
mergetool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
rles Bailey
git-archive: work in b
a
re repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
l
e
s
B
ailey
Make git archive respe
c
t
c
ore
.
a
u
to
c
rl
f
when c
r
eating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es
B
aile
y
Add new test to dem
o
n
strate g
i
t arc
h
ive core
.
autoc
r
lf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
a
r
l
e
s Bailey
merge-tool documentati
o
n: d
e
scr
i
be cu
s
tom command usag
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Ba
i
ley
git-mergetool d
o
cumentaiton: s
h
ow
t
o
olnames in typewr
i
ter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les B
a
iley
Add a v
e
r
y ba
s
ic test s
c
r
i
pt for git merg
e
tool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tea
c
h
g
it
m
e
r
getool
t
o u
s
e
cus
t
om commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
C
h
anged an internal va
r
iable of mergetool
t
o support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
e
y
Tidy
u
p git
m
ergetoo
l
's
b
ack
u
p file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gi
t
k:
F
ix t
h
e
Makefile to c
o
pe wit
h
sys
t
ems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles
B
a
i
ley
R
e
move old gener
a
ted
files from
.
giti
g
nore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
h
a
r
l
es Bailey
F
i
x
git
-
instaw
e
b br
e
akage on
MacOS X du
e
to the limi
t
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix
c
lone
n
ot
t
o ignor
e
depth when perfor
m
ing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree