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 'master' into next
2012-02-06
Theodore Ts'
o
Fix build problems
r
elated t
o
pro
f
i
l
e-directe
d
optimization
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-11-14
Theo
d
ore Ts'o
Remove hint t
o
use "
g
it
help -
a
"
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-11-14
T
h
e
odore Ts'o
Make the l
i
st of commo
n
co
m
mands more exclusive
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-09-29
The
o
dore Ts'o
mergetool: F
i
x typo in
options
passed to kdi
f
f3
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-09-29
The
o
dore Ts'o
mergetool
:
fix e
m
erge when r
u
nning i
n
a s
u
bdi
r
ec
t
ory
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-07-01
Th
e
o
d
ore Ts'o
Don
'
t ff
l
ush(stdo
u
t) when it's not
h
elpful
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-06-10
Theodore
T
s'o
git-m
e
rge
t
o
ol: Make default
selection of merge-tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-31
Theodore
Ts'o
Fix minor grammatical typos in the git-
g
c man page
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
T
h
eo
d
ore
Ts'o
Increase pack
.
depth default to 50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodore
T
s'o
Add pac
k
.
depth option to git-pack-objects
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theodo
r
e Ts'o
R
ename warn
(
) to w
a
rni
n
g() to fix symb
o
l conflicts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodor
e
T
s'o
mergetool: Clean up descripti
o
n of
f
iles and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
d
ore Ts
'
o
mergetoo
l
: Make git-rm quiet whe
n
resolvin
g
a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
mergetool:
Add support for
A
pple Mac OS X's opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
or
e
Ts'o
mer
g
etool: Fi
x
abort command when re
s
olving symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
mergetool: Remove
spurious error me
s
sage i
f
merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
e
od
o
re
T
s'o
mergetool: factor out common code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heod
o
re T
s
'o
m
ergetool: port
a
bil
i
t
y
fix
:
don't
use reserved wo
r
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: porta
b
ility fix: don't assume tru
e
is
i
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theo
d
ore Ts'o
merg
e
tool: Don't error out in the merge
c
ase
where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heodore Ts'o
m
e
r
g
e
tool: Re
p
lace use of "echo -n" with printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
do
r
e T
s
'o
Fix
minor form
a
tt
i
ng issue in man page
for git-mer
g
e
t
ool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Th
e
odore Ts
'
o
mergetool
:
print an
appropr
i
ate warn
i
n
g if merg
e
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'
o
Add
g
it-mergetool to run an appropriate merge con
f
l
ict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
The
o
dor
e
Ts'
o
Add defi
n
ition of <com
m
it-ish
>
to t
h
e m
a
in git m
a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
T
h
eodore Ts'o
A
l
low git-remote to update na
m
ed grou
p
s of remot
e
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
T
h
eod
o
re Ts'o
Add config_boolean() m
e
thod to the Git
perl mo
d
ule
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
h
e
odor
e
Ts'o
Te
a
c
h
g
i
t
-re
m
ote t
o
up
d
a
te
e
x
is
t
ing remotes by fet
c
hing
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodo
r
e Ts'o
Allow
ali
a
se
s
to ex
p
and to s
h
ell
c
om
m
ands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
P
rint a sane error message if
a
n alias expands
to a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
The
o
dore Ts'o
Fix formatting for urls sectio
n
of fe
t
c
h, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree