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
Git 2.1.0-rc0
2014-07-21
Cha
r
les Ba
i
ley
F
i
x co
n
t
rib/su
b
tree Makefile t
o
patch
#
! line
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-07-01
C
h
ar
l
es Ba
i
l
ey
filter-br
a
nch: eliminate
duplicate mapped p
a
rents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles B
a
iley
c
ompat
/
bswap
.
h: d
e
te
c
t endianness
o
n more platforms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bai
l
ey
test
s
: don't rely on strer
r
o
r text wh
e
n testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles B
a
i
ley
dir
.
c:
make git_fnmatch
(
) not inl
i
ne
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
m
e
rgetool: Re
m
ove exp
l
icit refe
r
enc
e
s
t
o /
d
ev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Char
l
es
B
ailey
stash tests: s
t
ash can lose data i
n
a fi
l
e r
e
move
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
harles B
a
ile
y
s
tash: D
o
n
'
t overwrite fi
l
es that have gone from
t
he
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
l
e
s Bailey
Documenta
t
ion: D
e
scribe other situations
where -z
a
ffects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Cha
r
les Bailey
Change xdl_merge
t
o
g
enerate out
p
u
t even
f
or null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
a
r
l
es B
a
iley
t6023: merge-file fails to o
u
t
p
ut anyth
i
ng for a de
g
e
n
erate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
B
a
iley
merge
t
ool: fix running mergetool in sub-direc
t
ories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles Bai
l
ey
mergetool: Add a test for runnin
g
m
erge
t
ool in
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles B
a
ile
y
merg
e
tool: respect autocrlf by using ch
e
ckout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bailey
me
r
getool:
Don't keep temporary merge fil
e
s u
n
les
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
e
y
m
e
rgetool:
A
d
d
pro
m
pt
t
o continu
e
af
t
er failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bai
l
ey
Add -y/--no-prompt option to merg
e
too
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harles Bailey
Fix some tab/
s
pa
c
e inconsistencies i
n
git-m
e
rgetoo
l
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
B
ailey
git-archiv
e
: w
o
rk in
b
a
re repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Ma
k
e git arch
i
ve r
e
spec
t
core
.
autocrl
f
wh
e
n
creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles Bailey
Add new test to demonst
r
ate git archive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
iley
merge-to
o
l documentation: descr
i
be custo
m
c
ommand
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
h
arles B
a
iley
git-mergetool
documentaiton: show
too
l
nam
e
s
i
n typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ail
e
y
Add a
very b
a
s
i
c te
s
t script for git mer
g
e
t
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach git mergetool to use custom com
m
a
n
d
s d
e
fined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Ba
i
l
e
y
Change
d
an internal variable o
f
mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
ar
l
e
s Bailey
Tidy
u
p
g
it merge
t
oo
l
'
s bac
k
up file behav
i
our
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
C
h
arle
s
Bailey
gitk: Fix the Makefile to cope with syst
e
ms lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles B
a
ile
y
R
emove old gen
e
rated
files from
.
gitignor
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Char
l
es
B
ailey
F
i
x git-instaweb breakag
e
on M
a
cOS X
due
t
o the l
i
mited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles
Bailey
Fix c
l
o
n
e not to ignore dep
t
h
whe
n
performing a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree