repo.or.cz
/
git
/
mergetool.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool: Fix typo in options passed to kdiff3
2007-09-29
Theodore
T
s'o
mergetool: Fi
x
typo in options
passed
t
o
kdiff3
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-09-29
Theo
d
ore Ts'o
merge
t
ool: fix emerge when running in a subdire
c
tory
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-07-01
T
heodor
e
Ts'o
Don't
f
flush(stdout) when it
'
s
n
ot h
e
lpful
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-06-10
T
h
eodore Ts'
o
git-merg
e
to
o
l: Mak
e
def
a
ult
s
election of me
r
ge-t
o
ol
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-31
Theodore Ts'o
Fix
m
inor grammatical typos in the git
-
g
c ma
n
page
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodore
Ts'o
I
ncreas
e
pack
.
depth defau
l
t to 50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodore Ts'o
Add pack
.
depth opti
o
n to git-p
a
ck-o
b
jects
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theodore Ts'o
Re
n
a
me w
a
rn() to warnin
g
() to f
i
x symbol conflicts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore
Ts'o
mergetool: Clean up descri
p
tion
o
f files
a
n
d prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'
o
mergetool: Make
git-rm
q
u
iet when resolving a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
merge
t
ool: Add support
for Apple
Mac
OS X's opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore
T
s'o
mergetool: Fix abort comm
a
nd whe
n
resolv
i
ng symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e
T
s
'
o
mergetool: Remove spurious error message i
f
m
e
r
ge
.
t
ool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore T
s
'o
mergetool
:
factor o
u
t
c
ommon co
d
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'o
merge
t
ool: portability fix: don't use rese
r
ved
w
ord
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
mergetool: portability fix:
d
o
n't a
s
sume true is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
mergetool: Don't
e
rror out in the merge case
wher
e
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
he
o
dore Ts'o
mergetool:
R
epla
c
e use of
"
echo
-
n
"
with printf(
1
)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
Fi
x
minor formatti
n
g is
s
u
e
in
man page f
o
r git-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'
o
mergetool: pri
n
t
an appropriate
warning
i
f merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
Add
gi
t
-mer
g
etool to r
u
n an appropriate merge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore T
s
'o
Add def
i
nition of <co
m
mit-i
s
h> t
o
the
main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
T
h
eodor
e
Ts'o
Allow git-
r
emote t
o
update named g
r
oups o
f
remot
e
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Add
co
n
fig_boolean() method to the Git perl m
o
dule
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
h
eodor
e
T
s'
o
T
e
ach gi
t
-remote to update existing r
e
motes b
y
fe
t
c
h
i
n
g
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
Allow aliases to e
x
pand to shell commands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore
Ts
'
o
Print
a
sa
n
e error message if
a
n alias expands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts'
o
F
ix f
o
r
matti
n
g for urls s
e
c
t
io
n
of fetch, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree