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 options passed to kdiff3
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-09-29
Theo
d
ore Ts'o
mergetoo
l
: fix eme
r
ge
w
he
n
running in a subdir
e
ctor
y
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-07-01
Theodore Ts'o
D
on't f
f
lush(stdout) when it's not helpful
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-06-10
Theodore
T
s'o
git-mergeto
o
l:
M
a
ke defau
l
t
s
election of merg
e
-tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-31
T
h
e
odor
e
Ts'o
Fix
m
i
n
or
g
rammatical
typos in the git-gc man page
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodore Ts'o
In
c
reas
e
p
ack
.
depth def
a
u
l
t
to 50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
T
h
eod
o
re T
s
'
o
Add
p
ack
.
depth
o
ption to git-p
a
ck-obj
e
cts
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theo
d
ore Ts'o
Rename warn() to warning() to fix s
y
m
b
o
l conflicts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Th
e
o
d
ore Ts'o
m
e
rgetool:
C
l
ean up description of files and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'o
mergetool: Make git-rm quiet w
h
en
r
eso
l
v
ing a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'o
merg
e
tool: Add suppo
r
t
f
or
A
p
ple M
a
c OS X's opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts
'
o
mer
g
e
t
o
ol:
Fix abort command whe
n
resolvin
g
sym
l
inks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Remove spuriou
s
error mes
s
age if me
r
ge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: factor
out common c
o
de
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetoo
l
:
portability fix: don
'
t
us
e
re
s
erved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool
:
portabil
i
ty fix: don't assume true is i
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
mergetool
:
Don't error out
i
n
t
h
e me
r
ge case where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Replace use of "echo -n" with printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
Fix minor formatting issue in man pag
e
for git-mer
g
etoo
l
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
T
heo
d
o
re Ts'o
merge
t
ool: print
a
n appropr
i
ate warning
i
f merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
The
o
dore Ts'o
A
d
d
gi
t
-mergeto
o
l
t
o
r
u
n an a
p
pr
o
priate merge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodo
r
e
T
s'o
Add
definiti
o
n
o
f <commit-ish> to
t
he m
a
in git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore
T
s'o
Al
l
o
w
g
it-remo
t
e to u
p
d
a
te name
d
groups
o
f
remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Add config_bo
o
lean
(
) method to
the Git perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore Ts'o
Teach gi
t
-
remote to update existing r
e
motes by fetch
i
n
g
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
he
o
do
r
e
T
s
'o
A
l
l
o
w aliase
s
to expand to
sh
e
ll c
o
mmands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
Pr
i
nt
a
sane error message if an
a
l
i
a
s expand
s
t
o
an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts'o
Fix forma
t
ting for
urls section
of fetch,
pull,
and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree