repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
gitweb: Syntax highlighting support
2010-04-18
Charles Bailey
Documentat
i
on: Describe ot
h
e
r
s
it
u
ations
w
here -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es Bailey
C
hange xdl_merge to ge
n
erate o
u
tput ev
e
n for nul
l
m
erges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
t6
0
23: merg
e
-file fails to output anything
f
or
a d
e
generate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
a
rles
Bailey
merg
e
tool:
f
i
x
running mergetool in
s
ub-directories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harl
e
s Bailey
me
r
getool:
Add a tes
t
for ru
n
ni
n
g mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bailey
m
e
rgetool: respec
t
autocrlf
b
y using
c
heckout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles B
a
i
ley
m
e
rget
o
ol: Don't keep tempora
r
y merge files
u
nless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
ar
l
e
s
Bail
e
y
merget
o
ol: Add prompt to continue after failing
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/-
-
no-prompt
o
ption t
o
mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rles Ba
i
ley
Fix so
m
e tab/spa
c
e inco
n
s
i
st
e
ncies in git-mergetoo
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git-archive: wor
k
in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les Bai
l
ey
M
a
ke
g
i
t
archive respect
c
ore
.
au
t
o
c
r
l
f when creatin
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bai
l
ey
Add
n
ew test to demonstr
a
te git archive cor
e
.
autoc
r
lf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles B
a
iley
mer
g
e-tool document
a
tion: desc
r
ibe c
u
s
t
om comm
a
nd usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es
B
ailey
git-mergetool documen
t
a
i
ton: show toolname
s
in typewri
t
er
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Add a v
e
r
y
basic test scrip
t
fo
r
g
it m
e
rgetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teac
h
g
i
t
merget
o
ol to use custom comm
a
nds
d
efined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Baile
y
Change
d
an interna
l
v
a
riable of mergetoo
l
t
o support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles
B
ailey
Tidy up git mergetool's ba
c
k
u
p file behavi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
es Bai
l
ey
gitk: Fix the Makefile to cope
w
i
th syst
e
m
s
lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
harles
Bailey
Remove ol
d
ge
n
e
rated
files from
.
g
i
tignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
F
i
x git-
i
nstaweb breakage on M
a
c
OS X due
t
o
the
limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clon
e
not
t
o ignore dep
t
h
when performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree