repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
diff-tree: avoid lookup_unknown_object
2014-07-01
Charl
e
s Bailey
filte
r
-
branch: eliminate
duplicate
m
apped pa
r
en
t
s
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
h
arles Ba
i
ley
co
m
pa
t
/bswap
.
h: dete
c
t endi
a
nn
e
ss on
mor
e
platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles
B
ai
l
ey
tests:
do
n
't re
l
y on s
t
rerror text
when testing rm
d
ir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
C
harles Bailey
di
r
.
c: make git_fnmatch() n
o
t inl
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Ch
a
rles Ba
i
l
ey
m
e
r
g
etool: Remove explicit referen
c
es
to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Cha
r
les Bailey
s
tash tests:
s
t
a
sh can lose da
t
a
i
n
a
f
ile
removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
ailey
stash: Don't overwrite
f
iles that hav
e
go
n
e from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
r
l
es Bailey
Documentation: Describe
o
ther situ
a
ti
o
ns where -z a
f
f
ects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles
B
ailey
Change
x
dl_merge to ge
n
erate output even for n
u
ll
m
erge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023: merge-file f
a
ils to output a
n
ythin
g
for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Bailey
m
ergetool:
f
ix running mer
g
e
tool
i
n s
u
b-
d
irectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Ba
i
le
y
mer
g
etool: Add a test for
r
u
n
n
ing mergetool in a
sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charle
s
Bailey
me
r
getool: respe
c
t
a
u
t
oc
r
lf
b
y using ch
e
c
k
ou
t
-ind
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
rles Bailey
mergetoo
l
:
Don't
k
eep temp
o
rary merge file
s
unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s Bai
l
ey
mergetool: Add prompt to con
t
inue after failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s
Bailey
Add -
y
/--no-pr
o
mpt option t
o
mergetoo
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Baile
y
Fix
some ta
b
/
s
pace incons
i
stencies in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Ba
i
l
e
y
g
it-archiv
e
: wor
k
i
n
bare
re
p
os
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Make git archi
v
e respect cor
e
.
autocrlf
w
h
en crea
t
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles B
a
iley
Add new t
e
st to demo
n
st
r
at
e
git archiv
e
core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bailey
merge-t
o
ol
do
c
umentation:
d
escri
b
e
c
ust
o
m
co
m
mand u
s
a
ge
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles Bailey
git-mergeto
o
l documen
t
aiton: show toolnames in
t
ypewr
i
ter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
ey
Add a very b
a
sic test script for git mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s
B
ailey
Teac
h
git
mergetool to use cust
o
m
co
m
mands de
f
ined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
C
h
anged an internal vari
a
ble of mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Bailey
Tidy up g
i
t merg
e
too
l
's ba
c
kup file b
e
haviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
a
r
l
es Bailey
gi
t
k: Fix the Makefile
t
o cope with
s
yst
e
ms
lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charle
s
Bai
l
ey
R
e
move old genera
t
ed files from
.
g
i
tign
o
re
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charle
s
Bailey
F
i
x
g
it-instaweb br
e
akage on MacOS X due t
o
the li
m
ited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Char
l
es Bailey
F
i
x clone not to ignore depth when
perform
i
ng a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree