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 'maint'
2007-06-10
T
heodore Ts'
o
git-merg
e
t
o
ol: Make default selectio
n
of merge-too
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-31
T
h
e
odore Ts'o
Fix
m
inor grammatical typos in the git-gc man page
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodore
T
s'o
Incr
e
ase pack
.
d
epth default to 50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
T
h
eodore Ts'o
Ad
d
pack
.
d
e
pth op
t
ion to
git-pack-objects
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
The
o
d
o
re Ts'o
Rename w
a
r
n
() to
w
arning()
t
o
fix symbol conflicts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
mergetool
:
C
lean
u
p description of files and prom
p
t
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mer
g
etool: Make git-rm qu
i
et wh
e
n resolving a
deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore T
s
'o
mergetool: Add
support for
Apple Mac OS X's op
e
n
d
iff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'o
mergetool: Fix abo
r
t
c
om
m
and
w
h
en
r
esol
v
ing sy
m
links
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts
'
o
mergetool: Remove spu
r
ious error message if mer
g
e
.
t
o
o
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
m
ergetool: fa
c
tor
out common code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodor
e
Ts'o
mergetool
:
portab
i
lity
fix: don
'
t us
e
reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
mergetool: po
r
tability fi
x
: don't ass
u
me tru
e
is
in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool:
D
on't error out
i
n th
e
merge case wher
e
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
merge
t
oo
l
:
R
eplac
e
u
s
e o
f
"echo -
n
" with print
f
(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore T
s
'o
Fix mi
n
or fo
r
matting issue i
n
m
a
n page for git-m
e
rg
e
tool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
mergetool: print an
a
ppropriate war
n
ing
if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theod
o
re Ts'o
Add
g
it-merge
t
ool to run an app
r
opriate merge confl
i
ct
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodor
e
Ts'o
Add definition of
<
c
o
mmit-ish> to the
main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theod
o
re
T
s'o
Allow gi
t
-remote
t
o
u
pdate named groups of remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
T
heod
o
re Ts'o
Add co
n
fig_boolean() met
h
od to
t
h
e
Git per
l
module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodo
r
e
Ts
'
o
T
ea
c
h git-remote to update
existin
g
remotes by fetching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Th
e
odore Ts'o
Allow alia
s
es to ex
p
and to
shell comm
a
nds
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
he
o
dore T
s
'
o
Pr
i
nt a sa
n
e error messa
g
e
if an
a
lias expan
d
s to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
T
heodor
e
Ts'o
Fix for
m
atting for
u
rls sec
t
ion of
fet
c
h, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree