repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Ignore all man sections as they are generated files.
2007-03-31
Theodor
e
T
s
'o
Rename warn
(
)
t
o warnin
g
(
)
to
fix
s
y
mb
o
l confl
i
cts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodo
r
e Ts'o
mergetool: Clean up desc
r
ipt
i
on of fi
l
es and p
r
ompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
T
s'
o
mergetool:
M
a
ke git-rm qu
i
et when resol
v
ing a delete
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodor
e
Ts'o
mergeto
o
l: Add support for Apple Mac OS X's opend
i
ff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'o
mergetool: Fix abort command when
r
esolving
s
ymlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Remove spurious error message
if
m
erge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s
'o
m
ergetool
:
f
a
ctor out common code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
e
r
getool: portabili
t
y fi
x
:
d
o
n't use res
e
rve
d
word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
m
ergetool: porta
b
i
lity f
i
x:
don't ass
u
me true is
in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
merge
t
ool: Don
'
t error out in
the merge
c
ase where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
m
e
rgetool: Replace use of "ec
h
o -n" wit
h
printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
d
ore Ts'o
Fix minor for
m
atting iss
u
e
i
n
m
an page for
git-merget
o
ol
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
mergetool:
p
r
i
nt an app
r
opria
t
e warning if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
Add git-merget
o
o
l
to
r
un an app
r
opriate me
r
ge con
f
lict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theo
d
ore Ts'o
Add defin
i
t
i
o
n
of <
c
om
m
it-ish> to the
m
ain
g
it man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theod
o
re Ts'o
Allow g
i
t-rem
o
te
t
o
update named
g
roups
of remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts
'
o
Add con
f
ig_boolean(
)
method
t
o
the Git perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
h
e
odore Ts'o
T
e
ach
g
it-remot
e
to up
d
ate e
x
isting remotes by fetchi
n
g
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
eodore Ts
'
o
A
llow ali
a
ses to expand
t
o shell com
m
a
nds
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
Print a sane error message if
an
a
l
i
as expands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts
'
o
Fix formatti
n
g for urls section of fetch, pu
l
l, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree