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
cvsimport: sync usage lines with existing options
2007-03-31
Theodo
r
e
T
s'o
Rename warn
(
)
to war
n
ing() to fix sym
b
o
l conflicts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Th
e
odore
T
s'o
m
e
r
getool: Clean up d
e
scription of files and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Make g
i
t-
r
m qui
e
t when
r
esolving a del
e
ted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
merge
t
oo
l
: Add
support fo
r
Apple Mac OS X's opend
i
ff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
d
ore Ts'o
mergetoo
l
: Fix abort
command when re
s
olv
i
ng symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
do
r
e Ts'o
m
e
rgetool:
R
emove spurious error mes
s
age if m
e
r
ge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'o
merg
e
tool: factor ou
t
common code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heod
o
re Ts'o
m
e
rgetool: por
t
ability
fix: do
n
't use reserved wor
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
mergetool
:
portability fix: don't assum
e
true is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
mergetool: Don't error ou
t
in the mer
g
e case
wh
e
re
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodor
e
Ts'o
merg
e
tool: Repla
c
e use of "echo -n" with p
r
intf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
o
re Ts'o
Fix
m
inor form
a
t
t
ing issue in man p
a
ge for git-mergeto
o
l
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
T
heo
d
o
r
e Ts'o
mergetool: print an appr
o
priate warning if
merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodor
e
T
s'o
Add git-m
e
r
g
etool to run an appropriat
e
merge
c
o
nflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore Ts'o
Add defini
t
ion
of <commit-is
h
> to
the main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Allow git
-
remote to
u
p
d
ate na
m
e
d groups
of re
m
otes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theod
o
r
e
T
s'o
Add config_boolean(
)
me
t
ho
d
to t
h
e
Git perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore
T
s'o
Teach git-rem
o
te
t
o update
e
x
is
t
i
n
g remotes by fetc
h
ing
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
eodore
T
s
'o
Al
l
ow aliases
to expand to shell comma
n
d
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
heodore Ts'o
P
r
int a sane er
r
or me
s
s
age if
an
a
lias expands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
The
o
d
o
r
e
Ts'o
F
ix formatting for url
s
s
e
ction of f
e
tch, pu
l
l, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree