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
introduce "format" date-mode
2015-06-25
Char
l
es
Ba
i
ley
Fi
x
de
f
init
i
on of
ARRAY_SIZE for non-gcc bui
l
ds
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
C
h
a
rles Bailey
dif
f
t
ool: don'
t
a
ssum
e
that default s
h
is sane
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-10-15
Charl
e
s Bail
e
y
mer
g
etoo
l
: don't require
a
work
tree for --tool-help
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-21
C
h
arle
s
Bai
l
ey
Fix contrib/sub
t
ree Ma
k
ef
i
le to patch #!
line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
Charles Bailey
filt
e
r-branch: eliminate duplicate mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bailey
compat/
b
swap
.
h: detect endianness on more pl
a
t
f
orm
s
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles B
a
ile
y
t
e
s
ts
:
don't re
l
y
o
n
st
r
er
r
or text when tes
t
ing r
m
dir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles Bailey
dir
.
c: make git_fnmatch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
h
arles Bailey
m
ergetool: Remove explicit
references to
/
dev
/
tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Ch
a
rles Ba
i
ley
stas
h
tests: stash can lose data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles
B
ailey
sta
s
h: Don't overwrite files
t
hat
h
ave go
n
e from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Documen
t
a
tion: Describe o
t
her situations w
h
e
re -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harle
s
Bai
l
ey
Change xd
l
_merge to generate outp
u
t even for null me
r
ges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
r
l
es Bailey
t6023: merge-fil
e
fails to outp
u
t anythin
g
for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
Bailey
me
r
getool: fix
runni
n
g
mergetool in sub-dire
c
tories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
B
ailey
merget
o
o
l: A
d
d a test
f
o
r runn
i
ng mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les Bailey
m
e
r
geto
o
l: respec
t
autocrlf by
u
sing
ch
e
ckout-inde
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
Ba
i
ley
mergetool: Don't kee
p
t
emporary merge files u
n
l
ess
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arle
s
Bailey
mergetool:
Add prompt to continue after f
a
iling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles B
a
iley
A
d
d
-y/--no-prompt option
t
o merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
F
i
x some tab/space inco
n
siste
n
cie
s
in git-me
r
g
e
tool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Cha
r
les Baile
y
git-archiv
e
: work in bare rep
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Ba
i
ley
Make
git ar
c
hive respect c
o
r
e
.
a
u
tocrlf w
h
e
n creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add new
tes
t
t
o
d
e
monstrate git archive
core
.
autocrl
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
B
ailey
merge-
t
ool docum
e
nt
a
tion: de
s
cribe custom
c
om
m
and usa
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles B
a
iley
git-mergetoo
l
d
o
cumentaiton: sh
o
w t
o
olnames in typewri
t
er
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very basi
c
test script for git mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Teach g
i
t me
r
g
e
tool to
u
se custom commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
C
h
a
n
ged
a
n internal v
a
riable of mergetool t
o
sup
p
o
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles
B
a
i
ley
T
i
dy
up git mergetool's backup file be
h
aviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Ch
a
rles Bailey
gitk:
F
i
x the Makefile to cope
w
it
h
systems
l
ac
k
i
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Cha
r
les B
a
iley
Remove
o
l
d
g
ene
r
ated
f
i
les from
.
giti
g
nor
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bai
l
ey
F
i
x git-instaweb breakage on
MacOS X due to the li
m
ited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
F
i
x
clone not to ign
o
re de
p
th when performing
a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
