repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 2.0.3
2014-07-01
Charl
e
s Bailey
filter-branch: eliminate duplic
a
te mapped
p
arents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Charles Bail
e
y
compat/bswap
.
h:
detect endiann
e
ss on more pla
t
forms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
t
e
s
t
s
:
don
'
t rel
y
on
strerr
o
r text w
h
e
n t
e
sting rmd
i
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c: make git_fnmatch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
merg
e
tool: Remov
e
explicit r
e
fere
n
c
e
s
t
o /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
stash te
s
ts: stash can lose
data in a file rem
o
ved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
stash
:
Don
'
t
overw
r
ite fi
l
es that have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
les Bai
l
ey
Docu
m
e
n
tat
i
on
:
D
escribe other situat
i
o
n
s where -
z
affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles Bailey
Chan
g
e x
d
l_merg
e
to gener
a
te output even for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023:
m
erge-file
f
ails to outp
u
t anything f
o
r a d
e
g
enerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
Bailey
merge
t
o
o
l: fix running mergetool in sub-d
i
rectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bai
l
e
y
mer
g
etool
:
Add a test for run
n
ing
m
e
rge
t
ool
in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
merge
t
ool
:
respect au
t
ocrlf by
using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
l
e
s
B
ailey
m
erget
o
o
l: Don't
k
eep tempo
r
ary merge file
s
unles
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles B
a
iley
m
e
rgeto
o
l: Add prom
p
t
t
o
c
ontinue after fail
i
ng to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
B
ailey
A
d
d
-y/--no-prompt option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charl
e
s Bailey
Fix s
o
m
e
tab/s
p
ace inconsistencies i
n
git-m
e
rgetoo
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
r
les Bailey
git-ar
c
hive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
Bailey
M
a
ke git ar
c
hive respect
co
r
e
.
a
u
tocrlf when
c
reating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
Bailey
Add new
test to demo
n
strat
e
git arc
h
ive core
.
au
t
ocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles Ba
i
ley
merge-t
o
ol docum
e
n
t
ation: des
c
ribe custom
c
o
m
m
a
nd
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-mergeto
o
l
d
o
cumenta
i
to
n
:
s
how toolnames in t
y
p
ewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bailey
Add a
very basic test s
c
ript for git
m
ergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bai
l
ey
T
e
ac
h
gi
t
merge
t
ool to us
e
c
u
sto
m
c
o
mman
d
s
defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
ley
C
h
anged
a
n int
e
rnal varia
b
le of mergetool to supp
o
rt
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
e
s
Bailey
Tidy
up
g
it mer
g
e
tool's backu
p
fil
e
behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charle
s
Bail
e
y
gitk: Fix th
e
M
a
kef
i
le to cope with systems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bai
l
ey
R
e
m
o
v
e
old generate
d
files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Char
l
es Bailey
F
ix
git
-
in
s
t
a
w
e
b
b
r
eaka
g
e on MacOS X
due to the l
i
mited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles
B
a
ile
y
Fix clone
n
o
t
to ignore depth when
p
e
r
forming a loca
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
