repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
pack-objects: turn off bitmaps when we see --shallow lines
2014-03-31
C
h
ar
l
e
s Bailey
tes
t
s
:
don't
r
ely on s
t
rerror tex
t
when
t
e
s
ti
n
g
r
mdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charle
s
B
a
iley
dir
.
c: ma
k
e
git_fnmat
c
h() no
t
inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Cha
r
le
s
Ba
i
ley
m
e
rgetool: Remove explicit references to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
stash te
s
ts: st
a
s
h can
l
ose dat
a
i
n a file re
m
oved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles Bai
l
ey
stash
:
Don't ove
r
write fi
l
es that
have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charle
s
Bailey
Docu
m
entation: Describe other sit
u
a
t
ions wher
e
-z affec
t
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rles Bai
l
ey
Change xd
l
_merge to generate ou
t
put even for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rles
B
ail
e
y
t6023: merge
-
fil
e
fails to
o
utpu
t
anything
f
or a de
g
ener
a
te
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
merge
t
o
ol: fix running mergetool in sub-di
r
ector
i
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harles Baile
y
mergetool: Add a
tes
t
for running mergetoo
l
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
merge
t
o
o
l
: re
s
pect a
u
t
o
cr
l
f by using che
c
kout
-
ind
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
les Bailey
mergeto
o
l
: Don't kee
p
temporary merge files
u
nless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bailey
m
e
rget
o
ol
:
Add
promp
t
to continue after failing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
a
r
les
Bailey
Ad
d
-
y
/--no-prompt op
t
ion to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles
B
ai
l
ey
Fix some tab/spac
e
inconsi
s
tenci
e
s in
git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
gi
t
-a
r
chive: work in ba
r
e repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles
B
ailey
Mak
e
git archive respect
core
.
aut
o
crlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Baile
y
Add
new
t
est to de
m
ons
t
rate git
archive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles Bailey
merge-
t
ool documentation: describe cus
t
o
m co
m
mand
u
sage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mergetool docume
n
tait
o
n: show toolna
m
es in
typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add
a very
basic test script
f
or git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Teach git merget
o
ol to use custom co
m
m
a
nds
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Ch
a
n
ged an internal variable of mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les B
a
iley
Tidy up g
i
t mergetool
'
s ba
c
kup file
b
e
h
a
v
i
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
B
a
iley
g
itk: Fix the Ma
k
efile to
cope with systems
lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Ch
a
rl
e
s Bailey
R
e
move old generated f
i
l
e
s from
.
giti
g
nore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harle
s
Bailey
Fix git-instaweb b
r
eakage on MacOS X due to the
l
imited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles B
a
iley
Fix
c
lon
e
not
t
o
i
gnor
e
d
e
p
th w
h
en per
f
orming a
l
ocal
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree