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
mergetool: Remove spurious error message if merge.tool config option not set
2007-03-29
T
heodore T
s
'o
mergetool: Remove spuriou
s
error
messa
g
e i
f
mer
g
e
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
merg
e
tool: factor ou
t
common code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'
o
mergetool: po
r
tabil
i
ty fix: don't use rese
r
v
e
d
w
ord
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
merg
e
tool: p
o
rtability
f
ix
:
don't assume true
i
s
in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
mergetool:
D
on't error out
in the merge case where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
or
e
Ts'o
mergeto
o
l: Re
p
lace use of "
e
c
ho -n" with print
f
(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fi
x
minor for
m
atting issue in man
p
age for
git-m
e
rgetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
mer
g
etool: prin
t
an a
p
propri
a
te warn
i
ng if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Th
e
o
d
o
re Ts'o
Add
g
it-
m
erg
e
tool to run
a
n appr
o
pri
a
te me
r
ge c
o
nflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore Ts'o
A
dd d
e
finition
of <commit
-
i
s
h> t
o
the main gi
t
man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Th
e
odore
Ts'o
A
l
l
o
w g
i
t-remot
e
t
o
upd
a
te
named groups of r
e
mote
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore
T
s'o
Add config_bo
o
lean()
met
h
od to the Git perl
m
odule
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore Ts'o
Tea
c
h git-remo
t
e
to u
p
d
a
t
e
existing remotes
b
y
fet
c
hing
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Th
e
odore
T
s
'
o
All
o
w alias
e
s to
expand to shell
c
ommands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
Print
a
sane e
r
r
or
m
e
ssage if an ali
a
s expands t
o
a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
The
o
d
o
re T
s
'o
F
i
x form
a
tting for u
r
l
s section of fetch, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree