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
Merge branch 'jc/index-output'
2007-03-31
Theodore
T
s
'o
Rename warn()
t
o
warning
(
) to fix symbol conflict
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
T
h
e
odore Ts'o
mergetool: Clean
u
p d
e
s
cri
p
ti
o
n of
f
iles and prom
p
ts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re T
s
'o
mergetool: Make git
-
rm quiet
when
r
eso
l
ving
a
deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Add s
u
pport for Apple M
a
c OS X's open
d
i
ff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
d
o
r
e
Ts'o
m
e
rgetool: Fix abort comm
a
nd when resolvin
g
sy
m
links
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore Ts'o
mergetool: Remove spurious e
r
ror
m
essage if m
e
rge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
mergetool:
f
actor out common c
o
d
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
mergetool: portab
i
lity
fix: don't us
e
reser
v
ed word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodor
e
T
s
'
o
mergetool: portabilit
y
fix:
d
o
n't
a
ss
u
me
t
rue is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool
:
Don'
t
error o
u
t
in the
m
e
rge case where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'
o
mergetool: Re
p
l
a
c
e use of "ech
o
-n" wi
t
h printf(
1
)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
d
o
re Ts'
o
Fix minor f
o
rmattin
g
issue in man
p
ag
e
for git-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
me
r
getool
:
pri
n
t an appropr
i
ate warning if
m
erge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theo
d
ore
Ts
'
o
Add g
i
t-mergetool
to run a
n
appropriate merge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Th
e
odore Ts'o
Add d
e
fin
i
tion of <
c
o
m
mi
t
-ish>
t
o
t
he ma
i
n
git
man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Al
l
ow gi
t
-remote to update nam
e
d groups of remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theod
o
re Ts'o
Add
config_b
o
olean() method to the Git per
l
m
o
dule
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
h
eodore
T
s'o
Teach git-remote to update existing remotes by fe
t
ching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
Allo
w
aliases
t
o 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
e
rr
o
r message i
f
an alias e
x
pa
n
ds to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore
T
s'o
F
ix
f
orma
t
ting for
urls sec
t
i
o
n
of fetch, pull,
an
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree