repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t5537: re-drop http tests
2014-03-31
Charle
s
Ba
i
ley
tests: d
o
n't rely on strerror text
w
hen tes
t
in
g
rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c: make
g
it_
f
nmatch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles B
a
iley
mergetool: Remove ex
p
l
i
ci
t
r
e
f
e
r
ences
t
o /d
e
v/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
stash tests: stash can
lose data in a
f
i
l
e removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles B
a
ile
y
stash:
Don't overwrite files tha
t
h
a
ve gone
f
r
o
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles B
a
i
l
e
y
Doc
u
mentation: Descr
i
be other s
i
t
u
ations
w
here -
z
a
f
fects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charle
s
Bailey
C
h
ange xd
l
_
m
e
r
ge to generate
ou
t
put e
v
en for nu
l
l merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t
6
023: mer
g
e-file fa
i
ls to outp
u
t anything fo
r
a
d
egenerat
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
rles Baile
y
merget
o
ol: f
i
x runnin
g
mergetool in s
u
b-d
i
r
e
ct
o
ries
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
Bailey
mergetool: Add a
test
f
or
running merg
e
tool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Ch
a
rl
e
s Bailey
mergeto
o
l: resp
e
ct autocrlf
b
y
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 m
e
rg
e
fi
l
es unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
harles Bailey
m
ergetoo
l
: A
d
d prompt to c
o
n
t
i
nue afte
r
failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bai
l
ey
Add -y/--no-prompt
o
pt
i
on
t
o
m
er
g
etool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
Bailey
Fix some tab
/
space
i
nconsistencies in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
B
a
i
l
e
y
git-ar
c
hive: work
in
bare r
e
po
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
Make git
a
rch
i
ve
respect
core
.
autocrlf
w
he
n
cre
a
ting
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add
n
ew test
to demonstrate git
archiv
e
core
.
auto
c
rlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles Bailey
merge-tool docu
m
e
n
t
ation:
d
es
c
ribe custom command us
a
g
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles
Bailey
git-merge
t
o
ol
d
ocumentaiton: sh
o
w
to
o
lnames i
n
type
w
rite
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Add a very basic test scri
p
t
f
o
r
git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach
git mergetool to use cu
s
tom
co
m
m
a
nd
s
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed an interna
l
v
ariable of mergetool t
o
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
B
ailey
T
i
dy up git mergetool's backup fi
l
e beh
a
viour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Ba
i
ley
gitk: Fix th
e
Make
f
ile to cope wit
h
syst
e
m
s
lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
arles
B
ailey
Remove old
generated files from
.
git
i
gnore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harles Bailey
Fix
g
it-instaw
e
b
b
r
eakage on
M
acOS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clone not to ignore
dep
t
h wh
e
n pe
r
forming
a l
o
cal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree