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
Merge branch 'mg/fix-log-mergetag-color' into maint
2014-07-01
Charles Bail
e
y
filter-branch: eliminate duplicate mapped
p
arents
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
h
arles
B
ailey
compat
/
bswap
.
h: detect endianness on more
p
la
t
f
orms
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Cha
r
les
B
ailey
tests: don't rely on
strerro
r
text
w
hen testi
n
g rmd
i
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
d
i
r
.
c: make git_fnm
a
t
c
h
() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
C
harles Bail
e
y
mer
g
e
tool: Remov
e
explicit references
t
o /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Charles Bailey
s
tash tests: st
a
sh can
lo
s
e data in a
f
i
le rem
o
v
ed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
st
a
s
h:
D
on't
ove
r
write files
t
hat h
a
v
e gon
e
f
r
om the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
Bailey
Docum
e
ntat
i
on:
D
e
s
c
r
ibe ot
h
er situatio
n
s whe
r
e -z
a
ffects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
Change xdl_
m
e
r
ge to generate output even
fo
r
null m
e
rges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ailey
t6
0
2
3
: m
e
rge-file fails to out
p
ut anything for a degener
a
te
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
es Bailey
mergetool: fix run
n
ing mergetool in sub-dir
e
ctories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bai
l
ey
merge
t
ool: Add
a
test for running mergetool
in
a su
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les Ba
i
ley
mergetool
:
respec
t
a
u
t
o
cr
l
f by using ch
e
ckout-inde
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ail
e
y
mergetool
:
Don't keep temporary me
r
ge
f
iles
u
nless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles B
a
iley
me
r
getool: A
d
d
pro
m
pt to
co
n
tinue af
t
er
failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
ar
l
es Bai
l
ey
Add -y/--no-promp
t
optio
n
to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
harl
e
s Bailey
Fix some tab/space incons
i
s
t
encies
in
g
it-merge
t
o
o
l
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bai
l
ey
git-archiv
e
:
w
ork in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
le
s
Baile
y
M
ake git ar
c
hive respect core
.
au
t
ocrlf when creat
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
B
ailey
Add new test to
demonstrate git archive co
r
e
.
autoc
r
l
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
B
a
i
l
e
y
m
erge-tool documentation: desc
r
i
b
e custom com
m
and usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git
-
mer
g
etool
documentait
o
n: show
t
oolna
m
es in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
e
y
Ad
d
a very basic te
s
t script for git
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
T
each
gi
t
m
ergetool to use cust
o
m com
m
ands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
es Bailey
Cha
n
ged an inter
n
al variable of mer
g
etool to
sup
p
o
r
t
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Tidy up
git mergetool's
backup file beha
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: F
i
x
t
h
e Makefile
to c
o
pe with systems lackin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Ba
i
ley
Remo
v
e old gene
r
ate
d
files from
.
gitigno
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fi
x
git-instaweb breakage
on MacOS X due
to the
l
imited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
F
i
x
c
l
o
ne
n
o
t
to ignore depth when performing a loc
a
l
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree