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
mer
g
etool: Fix typo in opti
o
ns passed t
o
kd
i
ff3
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-09-29
T
h
e
o
dore Ts'o
m
e
r
g
e
tool: f
i
x
emerge when running
i
n a subdirectory
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-07-01
Th
e
odore Ts'o
Don't
f
flush(stdout) when i
t
's
no
t
helpful
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-06-10
Theo
d
ore Ts'o
git-mergetool: Make
default
selection of merge-tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-31
Theod
o
re Ts'o
Fix minor grammatica
l
typos in the git-g
c
ma
n
page
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theod
o
re Ts'o
Increase pack
.
depth default
t
o 50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theod
o
re Ts'o
Add
p
ack
.
depth option to git-pack-objects
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theodore Ts'o
Rename warn() to warning()
t
o fix symbol confl
i
cts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore T
s
'o
mergetool: Clean u
p
description of files
and prompt
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heod
o
r
e
Ts'o
merg
e
tool: Make git-rm
q
uiet whe
n
r
e
s
olving a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
me
r
g
e
tool: Add support for
App
l
e Mac OS
X
's opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
odore Ts
'
o
m
er
g
etool: Fix abort command when resolving
s
ymlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'o
mergetool: Remove
s
pu
r
i
ous er
r
or
message if mer
g
e
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'o
mergeto
o
l
:
factor out
c
ommon
code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
T
s'o
mergetool
:
portability fix: don't
us
e
reserved
w
o
rd
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re
Ts'
o
m
ergetool:
p
ortability fix: don't assume 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
geto
o
l
:
Don't
er
r
or out in
t
he merge c
a
se
where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
mergetoo
l
: Repla
c
e u
s
e
of "ech
o
-n" with printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore Ts
'
o
Fix
minor formatt
i
n
g issue in m
a
n page fo
r
g
it-m
e
r
get
o
o
l
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
mer
g
e
tool: print an
a
ppropriate
warning if
merge
.
t
o
ol
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theod
o
re Ts'o
A
dd g
i
t-m
e
rge
t
ool to run
a
n appro
p
r
iate merge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore Ts'o
A
d
d
def
i
n
i
tion of <commi
t
-ish> t
o
the m
a
i
n
git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodor
e
Ts'o
A
l
low
gi
t
-remo
t
e
t
o update
named
g
roups o
f
remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodo
r
e T
s
'o
A
d
d config_boo
l
ea
n
()
m
ethod to the Git pe
r
l
module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodo
r
e Ts'o
Teach g
i
t
-remote to update e
x
isting rem
o
tes by fe
t
ching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
Allow aliases to expan
d
to shell commands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theo
d
or
e
Ts'o
Pri
n
t a
sane error
messag
e
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
Fix
f
o
r
mat
t
ing for urls section of fetch,
p
ull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree