repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
GIT 1.5.1.2
2007-03-31
Theodor
e
Ts'o
R
e
n
a
me warn() to warning(
)
to fi
x
s
y
mbol conflic
t
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
m
e
rg
e
tool: Clean up description of files
a
n
d prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'o
mergetool: Make git-rm quiet when resolving a
d
eleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
merg
e
tool: A
d
d support for Apple Ma
c
OS X's
o
p
e
ndiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'o
mergetool: Fix abort co
m
mand whe
n
reso
l
ving symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e T
s
'o
merg
e
tool: Remo
v
e spurious e
r
ror message if
m
erge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'o
m
e
rgetool: f
a
ctor out common code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: portability f
i
x: don't us
e
reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'o
me
r
g
et
o
ol: portability fix:
d
on't assume
t
rue is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'
o
mergetool:
Don't error
out in t
h
e merge cas
e
where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
merget
o
ol: Replac
e
use
o
f
"
echo -n" with print
f
(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fix minor
f
orm
a
t
t
i
n
g
issue
in man page for g
i
t-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodor
e
Ts'o
mergetoo
l
:
p
rint an
appropriate war
n
ing
i
f merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore T
s
'o
Add
g
i
t
-
me
r
geto
o
l to run
an appropriate merge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theo
d
ore
Ts'
o
Add
defin
i
tion of <
c
ommit-ish> to the main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts
'
o
Allow
g
it-remote
t
o
u
p
d
a
te named groups o
f
r
e
mot
e
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Th
e
odore Ts'o
Add co
n
fig_boole
a
n
(
) method to
the Git perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodo
r
e Ts'o
Teach git-remot
e
to update
e
x
i
sting remotes by fetching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theo
d
ore
Ts
'
o
Allow
aliases to
e
xpand
to shell c
o
mma
n
ds
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theo
d
ore Ts'o
Print a sane error message i
f
an alias
e
xpands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theod
o
re Ts'o
F
i
x
f
ormatting
f
or
u
rls section of
f
etch, pu
l
l
,
a
n
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree