repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Honor -p<n> when applying git diffs
2007-03-31
T
heo
d
o
re
T
s'o
Re
n
ame wa
r
n() to warning()
t
o
fix symbol conflicts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Th
e
odore Ts'o
merg
e
tool: Cl
e
a
n
up desc
r
i
p
t
ion of files and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'
o
m
ergetool:
M
ak
e
git-rm
qu
i
et when re
s
olving a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e T
s
'
o
mergetool: Add support for Appl
e
Mac OS X's op
e
ndiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'o
me
r
getool: Fix abort command when res
o
lving symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodo
r
e
T
s
'
o
mergetool: R
e
m
o
ve
spur
i
ous e
r
ror messa
g
e
if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
r
e
T
s
'
o
mergetool: fa
c
tor out comm
o
n code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'o
mergetool:
p
ort
a
bility fix: don't use reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
merg
e
tool: por
t
ability
f
ix: don't
assume t
r
u
e is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e
T
s'o
m
e
rge
t
ool: Do
n
't error out in the mer
g
e
case where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'
o
merg
e
tool: Replace use of "ec
h
o -n" with
p
ri
n
t
f
(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore
T
s'o
Fix minor
f
ormatt
i
ng issue in man page for git
-
m
e
rg
e
tool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Th
e
o
d
ore Ts'
o
merg
e
t
o
o
l: print an appr
o
priate wa
r
ning i
f
merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
T
heodore
Ts'o
Add git-m
e
rgetoo
l
to run an appr
o
priate
merge conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore Ts'o
Add d
e
fi
n
ition of <
c
ommit-ish> to t
h
e main git m
a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
T
h
e
odore Ts'o
Allow git-
r
emote
t
o u
p
date
named groups of rem
o
tes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
The
o
dore Ts'o
Add
c
o
nfig_boo
l
ean
(
) metho
d
t
o
the Git pe
r
l
module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
h
eodore Ts'o
T
each git-
r
emote to update
e
x
isting remotes by
f
e
t
ching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore T
s
'o
Allo
w
aliases to expand to shell com
m
ands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
The
o
dore Ts'o
P
rint a sane
e
rror me
s
s
age if an
a
l
ias
e
xpands to a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
T
h
eodore Ts'o
Fix formatt
i
ng f
o
r urls s
e
ction of fetch, p
u
ll, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree