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
variable $projectdesc needs to be set before checking against unchanged default.
2007-03-31
T
heodore
T
s'o
Ren
a
m
e
warn
(
)
t
o warning() to fix symb
o
l confl
i
cts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
merg
e
tool: Clean
up
d
escriptio
n
of files and promp
t
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heo
d
ore Ts'
o
mergetool: Make git-rm qu
i
et when res
o
l
v
ing a delete
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'o
me
r
getoo
l
:
Add support for Apple
M
a
c
O
S
X's opend
i
ff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'
o
mergetool: Fix
abort command when
resolving sy
m
l
i
nks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'o
mer
g
etoo
l
: Remove spuriou
s
er
r
or me
s
sage if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
odor
e
Ts'o
mergetool: fac
t
o
r
out c
o
mm
o
n code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: portability
f
ix
:
d
o
n't
use r
e
served word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'o
m
e
rgetool: p
o
rtabili
t
y
fix:
don't a
s
sume true is i
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re
T
s
'
o
m
e
rgetool: Don't
e
rror ou
t
in the merge case where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
ergetool:
Replace use
of "echo -n" wit
h
printf(
1
)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore T
s
'
o
Fix min
o
r formatting issue in man
p
age for git-mergetoo
l
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore
T
s'o
mergetoo
l
: p
r
int an
a
ppropriate war
n
in
g
if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
Add git-merge
t
o
ol to ru
n
an ap
p
ropriate merge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Th
e
o
dore T
s
'
o
Add definition of <c
o
mm
i
t-ish> to
t
he main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore
T
s
'
o
Allow g
i
t-remote t
o
update named groups of remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore T
s
'o
Add con
f
ig_bo
o
lean() method t
o
the Git
perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
he
o
dore
T
s
'o
Teach git-remote to
update exis
t
ing remote
s
by fetching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
eodore Ts'
o
Allow aliases to expand
t
o she
l
l
com
m
ands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
heodore Ts'o
Prin
t
a sane err
o
r messa
g
e
i
f an alias e
x
pands to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts'o
Fix formatting
for
u
rls
s
ection of fetch,
pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree