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 Ts'o
mergetool: Fix
typo in
o
p
tion
s
pa
s
sed to
k
diff3
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-09-29
Theodore Ts'o
merg
e
t
o
ol: fix
e
mer
g
e wh
e
n runn
i
ng in a su
b
directory
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-07-01
Theodore Ts'
o
Don
'
t fflush(stdout)
when
i
t's not
helpful
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-06-10
Theodore Ts'o
git-mergetool:
Make default se
l
ection
of merge-tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-31
The
o
dore Ts'o
Fix
m
i
n
or g
r
ammatical typos in the git-gc man p
a
g
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodore Ts'o
Increase
p
ack
.
de
p
th defaul
t
to 50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodore Ts'o
A
dd pack
.
depth opt
i
on to
git-pac
k
-objects
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Th
e
odore Ts'o
Rename w
a
rn() to warning() to
fix symbol conflicts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodor
e
Ts'o
merg
e
tool: Clean up des
c
ription of files and p
r
o
m
pts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'
o
mergetool:
M
ake git-rm
q
uiet when reso
l
ving a de
l
eted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore Ts'o
mergetool: Add supp
o
rt for
Apple
M
ac OS X'
s
opendi
f
f
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eod
o
re
Ts'o
merget
o
ol: Fix
abo
r
t
command wh
e
n
res
o
lvi
n
g symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
d
ore Ts'o
merge
t
ool:
R
emove spurio
u
s error
m
ess
a
ge if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
m
erge
t
o
o
l: factor out
c
ommon
code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'o
mergetool: porta
b
ili
t
y
f
i
x
: don't
u
se
reserved
w
o
rd
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodo
r
e Ts'o
mergetoo
l
: porta
b
ility fix
:
don't a
s
s
u
m
e
true is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'
o
me
r
getool: Don't error out in the
m
erg
e
c
a
s
e
whe
r
e
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'
o
mergetool:
Rep
l
a
ce use
o
f "echo -n"
w
ith p
r
intf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
od
o
r
e
Ts'o
F
i
x minor formatting is
s
ue in
m
an p
a
g
e
for git-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Th
e
odore Ts'o
m
e
rgetool:
p
rint an
a
ppr
o
priate warning if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
Add git
-
mergetool
t
o run a
n
a
p
propr
i
ate me
r
ge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
T
heodore
Ts'o
Add def
i
ni
t
i
o
n
o
f <
c
ommit-ish> to
t
he ma
i
n g
i
t
m
an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodor
e
Ts'
o
Allow git
-
remote to update named
g
roups of
remo
t
es
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
The
o
dore Ts'o
Add config_boolean() method to the Git perl modul
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore Ts'o
T
each git-remote t
o
upda
t
e existing remote
s
by fetching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
e
odore
T
s
'
o
Al
l
ow aliase
s
to expand to shell comm
a
nds
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore T
s
'o
P
r
int a sa
n
e
e
r
r
or
m
essage if
a
n
alias
e
x
pa
n
d
s
to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts'o
Fix
f
ormattin
g
for urls section of fetch
,
pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree