repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
dir.c: make git_fnmatch() not inline
2014-03-31
Char
l
e
s Bailey
dir
.
c: make
g
it_fn
m
atch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charle
s
B
ai
l
e
y
mergetool: Remove expli
c
it re
f
er
e
nces to /dev
/
tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bail
e
y
stash
t
es
t
s
:
stash can lose data in a
f
ile removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
arl
e
s Bailey
st
a
sh: Don
'
t o
v
erw
r
ite files t
h
at have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charle
s
Bailey
Documentation
:
Describ
e
other situati
o
ns
w
here
-
z aff
e
ct
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change
x
dl_merge to g
e
n
e
ra
t
e output even f
o
r null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les Bailey
t602
3
: mer
g
e-file fails to
o
utput anything f
o
r a d
e
g
e
n
e
rate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
r
l
es
Bailey
m
e
rge
t
ool: fix r
u
n
n
ing merget
o
o
l
in sub-d
i
r
ectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Ba
i
ley
mergetool: Add a test for
r
unning
mergeto
o
l in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Ba
i
l
ey
merget
o
o
l
: re
s
pect autocrlf by usi
n
g chec
k
out-inde
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Bailey
m
e
rgetool:
Don'
t
keep
te
m
p
o
rary
m
erge fil
e
s unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s
Bailey
me
r
g
e
tool: Add prompt to c
o
ntinu
e
a
f
ter failing
to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
es Bailey
Add -
y
/-
-
n
o-prompt op
t
ion
t
o
m
ergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
B
ai
l
ey
Fi
x
some tab/space i
n
consi
s
tencie
s
i
n
gi
t
-
m
ergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
rles Bai
l
ey
git-a
r
chive
:
wor
k
in bar
e
repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git arch
i
ve res
p
ect core
.
autocrlf when cre
a
tin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
ar
l
es Baile
y
Add
new test
t
o demonstrate git archiv
e
c
ore
.
auto
c
rlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
merge-tool documentation:
d
escribe
c
u
stom
c
ommand usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
g
it-mer
g
et
o
ol docum
e
nt
a
iton: sho
w
t
o
olnames in ty
p
e
w
r
i
ter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
e
s
Bail
e
y
Add a
very b
a
sic
test script f
o
r
git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bail
e
y
Teach git merg
e
t
ool to use cu
s
t
o
m
c
om
m
ands
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Changed
a
n int
e
r
n
al
v
ariable of mergetool to
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
T
idy
u
p
git me
r
g
etool's
b
a
ckup file beh
a
viour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
g
i
tk
:
Fix
t
he M
a
kef
i
le to cope with syst
e
ms lac
k
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bai
l
e
y
Re
m
ove ol
d
g
e
nerated files from
.
g
i
t
i
gno
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles
B
ailey
Fix
g
it-inst
a
w
e
b break
a
ge on
M
ac
O
S
X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
harles
B
a
il
e
y
Fix clone n
o
t to
i
gnore
d
epth w
h
en perf
o
r
m
i
ng a
l
ocal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree