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 1.7.0.7
2010-04-18
Charles Bailey
Documentati
o
n: Descr
i
be othe
r
sit
u
ations where -z
affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bail
e
y
Cha
n
g
e xd
l
_merge to gene
r
ate output even for n
u
l
l
merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rle
s
Bailey
t
6023: merge-file
f
ails to outpu
t
a
nything for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charl
e
s Bai
l
ey
m
ergetool
:
fix runnin
g
me
r
getool
in sub-di
r
ect
o
ries
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles B
a
i
l
ey
mergetool
:
Add
a
test
f
or running mergeto
o
l in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles
Bail
e
y
mergetool: respect autocrlf by using c
h
ec
k
out-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Ch
a
r
les Bailey
mergetool
:
Don't k
e
ep t
e
mpo
r
a
ry merge
files unl
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
l
e
s
B
a
iley
mergetool: Add prompt to
continue
a
fter fai
l
ing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/-
-
no-prompt option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Cha
r
le
s
Baile
y
Fix som
e
t
a
b/space inco
n
s
i
s
t
encies in g
i
t-me
r
get
o
o
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Ch
a
rles Bailey
git-archive: work in bare repo
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
Bailey
Ma
k
e git archi
v
e respect
core
.
aut
o
crlf when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
rles
B
ail
e
y
Add
n
e
w
t
est
to d
e
monstrate git archive
c
ore
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
me
r
ge-tool document
a
tion: describ
e
c
us
t
om co
m
ma
n
d usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-merget
o
ol doc
u
me
n
taiton
:
show toolnames
i
n typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
i
ley
A
d
d a
v
ery basic test scri
p
t
for git m
e
rgetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
l
es
B
ai
l
ey
Teach git merg
e
t
o
o
l
t
o use c
u
stom
c
ommands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
ley
Changed an internal variable of mergetool t
o
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
i
l
e
y
Tidy up gi
t
mer
g
etool's
b
a
c
k
up file
b
ehaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Baile
y
gitk: Fix t
h
e Makefile to cope with
s
ystems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles
B
a
i
ley
Rem
o
v
e old ge
n
erated files from
.
gi
t
ignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles
Bailey
F
i
x git-instaw
e
b breakage on MacOS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles B
a
i
l
ey
Fix
c
lon
e
not to ignor
e
depth when performin
g
a lo
c
al
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree