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
home_config_paths(): let the caller ignore xdg path
2014-07-01
Charles Ba
i
ley
filte
r
-branch: el
i
minate du
p
l
ica
t
e mapped parents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
Ch
a
rles Bailey
compat
/
b
s
wap
.
h: detect endian
n
ess on
m
ore
p
la
t
f
orm
s
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Ch
a
rles Bailey
tests: don't re
l
y on stre
r
ror text when testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charle
s
Ba
i
ley
dir
.
c
: make git_fnm
a
t
c
h
(
) not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charles Ba
i
ley
mergetool: Remove e
x
p
l
i
cit r
e
ferences
to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Ba
i
ley
stash tes
t
s:
st
a
sh
c
a
n lo
s
e dat
a
in
a
file
r
e
m
ov
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Ch
a
rles B
a
ile
y
stash:
D
on't ove
r
wri
t
e files
t
hat ha
v
e gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Documentation:
D
escribe other
situations where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rles Bailey
C
hange xdl_mer
g
e
to generate o
u
tput even fo
r
null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es Bail
e
y
t6023: merge-
f
ile fa
i
ls to outp
u
t anything
f
or a
d
e
generate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
arles B
a
iley
mergetool: fix running me
r
g
etool in sub-director
i
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bai
l
ey
mergetool: Add
a
t
e
st
fo
r
r
u
n
ning mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles
B
aile
y
mergetool:
r
e
s
pect
autocrlf by using checkou
t
-
i
ndex
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: D
o
n't
ke
e
p
t
empora
r
y merge files unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
mergetool: Add promp
t
to con
t
inue af
t
e
r f
a
i
l
ing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Char
l
e
s
B
a
i
l
ey
Add -y
/
--no-prompt o
p
tion to
m
e
rgetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles B
a
iley
Fix some tab/space inc
o
nsi
s
te
n
c
ies in
g
i
t-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles
Bailey
gi
t
-
a
r
ch
i
ve:
w
ork in bare repo
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Ba
i
ley
M
a
ke gi
t
archive respect core
.
aut
o
cr
l
f
wh
e
n creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles B
a
i
ley
Add new
t
e
s
t to demonst
r
ate git
a
r
c
hive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
l
e
y
m
e
r
ge-tool documentation
:
d
e
scribe
custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
e
s
Bail
e
y
git-mergetool documentai
t
on: s
h
ow tool
n
ame
s
in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bail
e
y
Add a very ba
s
i
c
t
est script for
g
it
mer
g
etool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach
g
i
t mergetool to use custom
c
o
mmands defi
n
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bail
e
y
Ch
a
nged an inter
n
al va
r
iable
o
f m
e
rg
e
to
o
l to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bail
e
y
Tidy u
p
g
i
t mergetool'
s
back
u
p file behaviou
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
Bailey
gitk: Fi
x
the Makefile t
o
cope with system
s
l
ac
k
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charl
e
s Bail
e
y
Remove ol
d
generated fil
e
s
f
r
om
.
gi
t
i
gn
o
re
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git-i
n
sta
w
eb
b
r
eakage on Mac
O
S
X due
t
o the li
m
ite
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Ch
a
r
l
es Bailey
Fix clone not to ignore depth when pe
r
f
ormi
n
g a l
o
c
al
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
