repo.or.cz
/
tgit.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.1-rc2
2010-04-18
Char
l
es B
a
iley
Documenta
t
ion: Describe other situations w
h
ere -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rles
Bailey
Change xd
l
_mer
g
e to generate output ev
e
n for null mer
g
es
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6023:
m
erge-file fails to outpu
t
any
t
hing f
o
r a degener
a
te
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
m
e
r
getool: fix running mergetoo
l
i
n
s
ub-directo
r
ies
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bai
l
ey
mergetool: Add a test
f
or run
n
ing mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
merge
t
ool: respect autocrlf by using checkou
t
-ind
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bail
e
y
m
ergetool: D
o
n't keep tempo
r
ary
me
r
ge files
u
n
l
ess
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bailey
merg
e
tool: A
d
d
pro
m
pt to continue
af
t
er fail
i
ng to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles B
a
iley
Add
-
y/--no-promp
t
option to
m
erge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
B
ailey
Fix some tab/
s
pace inconsistencies in gi
t
-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charl
e
s Bailey
git-
a
rchive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
M
ake git a
r
chive resp
e
ct core
.
a
utocrlf when cre
a
t
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add n
e
w
t
es
t
to demons
t
r
a
te g
i
t a
r
chive core
.
au
t
o
crlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
mer
g
e-tool
d
ocum
e
n
t
a
t
ion:
d
escribe custom command
u
sag
e
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Bailey
g
i
t-mergetool
d
ocumen
t
aiton:
s
how toolnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s
Baile
y
Add a very basic test
script for git
merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles
Bailey
T
each git merget
o
ol to use cu
s
tom commands defin
e
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les
Ba
i
ley
Changed an inte
r
nal
variable of mergetool to
support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
B
ailey
Tid
y
up
git mer
g
etool
'
s backup file beh
a
viour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Cha
r
les Bailey
gitk: Fix t
h
e Ma
k
efil
e
to cope wi
t
h system
s
lacki
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles Bailey
R
emove
old
g
enerat
e
d fi
l
es fr
o
m
.
gi
t
igno
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Baile
y
Fix git-instawe
b
breakage
o
n M
a
cOS X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clon
e
not to i
g
n
o
re de
p
th w
h
en per
f
ormi
n
g
a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree