repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS
2007-03-31
Theodore
T
s'o
Rename wa
r
n
() to w
a
rning
(
) to
fix symbol confl
i
ct
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore
T
s'o
mer
g
etool: Cl
e
an up descript
i
on of fil
e
s and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
r
e Ts'o
m
erg
e
tool:
Make gi
t
-rm quiet when resol
v
ing a del
e
ted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
mergetool: Add suppor
t
for Ap
p
le Mac
OS X's opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
d
o
re
T
s'o
mergetool: Fix abor
t
command when resolving symli
n
k
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
d
o
re Ts'o
mergeto
o
l: Remo
v
e
s
puri
o
u
s
error message if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: factor out common code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
do
r
e Ts'o
mergetoo
l
: porta
b
ility fix: don't use reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e
T
s'o
mergetool: portability fix: don't
as
s
ume t
r
ue is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s
'o
mergetoo
l
: Don't error out
i
n
the me
r
g
e case where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
o
dore
T
s'o
mer
g
etool: Repla
c
e use of "echo -
n
" with
p
rint
f
(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'
o
F
i
x m
i
nor format
t
ing i
s
sue in
m
an page for git-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
me
r
getool: print an
app
r
opriate warning if merge
.
to
o
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
T
heodore Ts'o
Add git-mergetool to
run an appropr
i
ate mer
g
e conf
l
i
c
t
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodo
r
e Ts'o
Add defi
n
i
t
i
on of
<commit-ish
>
to th
e
main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
T
h
eodore Ts'o
Allow git-remot
e
to update na
m
e
d
group
s
of
r
em
o
tes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore T
s
'o
Ad
d
config_boolean() method to the Git perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
h
e
o
dore Ts
'
o
Teach git-
r
emote to update
existing remotes by
fetc
h
i
ng
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
heodore Ts'o
Al
l
ow aliases to expand to shell
commands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore
Ts'o
Print a sane error mes
s
age
if
a
n alias
e
xpands
to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodor
e
Ts'o
F
ix
f
orma
t
ting
f
o
r
u
r
l
s se
c
tio
n
of fetch, p
u
ll, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree