repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool: Don't error out in the merge case where the local file is deleted
2007-03-29
Theodore Ts'o
mergetool: Don't er
r
or out in the merg
e
case
w
here
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Replace
u
se of "
e
cho
-
n
"
with
printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
F
ix
minor formatt
i
ng i
s
s
ue in man pa
g
e
f
or git-me
r
g
etool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
T
he
o
d
o
r
e Ts'o
mer
g
etool:
print
a
n
a
p
propriate 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 to
r
un an
appropriate
m
erge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore
Ts'o
Add
d
efinitio
n
of <commit
-
ish>
t
o the main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
All
o
w
git
-
r
emote to u
p
date
n
amed groups of remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Add config_boo
l
ean() method to the Git perl mo
d
ul
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodo
r
e Ts'o
Te
a
c
h
g
it-re
m
ote to upda
t
e exi
s
tin
g
r
e
motes by f
e
tching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodo
r
e Ts'o
Al
l
ow aliases to
e
x
p
and to shell
c
ommands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theod
o
re Ts'o
Print a sane error
messag
e
i
f an ali
a
s ex
p
ands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
The
o
d
ore T
s
'o
Fix formatting
for urls sectio
n
of
f
etch,
pull, an
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree