repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jn/ancient-meld-support'
2012-02-06
Theodore Ts'o
Fix bui
l
d proble
m
s rela
t
ed to pr
o
f
i
le-directed
optimi
z
ati
o
n
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-11-14
Th
e
odore Ts'o
Remov
e
h
i
nt to use "git help -a"
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-11-14
Theodo
r
e Ts'o
Mak
e
the list of common commands mo
r
e exclusive
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-09-29
T
heodore Ts'o
merget
o
ol: Fix typo in option
s
passe
d
to kdiff
3
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-09-29
T
heod
o
r
e T
s
'o
mergetool: fix emerg
e
w
he
n
running in a s
u
bdirect
o
ry
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-07-01
Th
e
odore Ts'o
Don't
f
flush(stdout)
w
hen it's
n
ot he
l
pful
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-06-10
Theodore
T
s'o
git-merget
o
o
l: Mak
e
de
f
ault
selection
o
f m
e
rge-tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-31
Theodore Ts'o
Fix min
o
r grammatical typos in the
g
it-gc m
a
n page
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
T
heodore Ts'o
Increase pack
.
d
e
pth default to 50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodore Ts'o
A
d
d pack
.
depth op
t
ion to git-pa
c
k-objects
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theodor
e
T
s
'o
R
ename w
a
rn() to warnin
g
()
t
o fix symbol
conflict
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts
'
o
merg
e
tool: Clean
up description of file
s
and pro
m
pts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
merge
t
ool: Make git-rm quiet
w
h
e
n re
s
olving a del
e
ted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore
T
s
'o
m
ergetool: A
d
d sup
p
o
r
t for Apple Mac OS X's opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'o
mer
g
etool: F
i
x abort co
m
mand when resolving sym
l
inks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
mergetoo
l
: Re
m
ove spur
i
ous error
message if mer
g
e
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
mergetool: factor
o
ut co
m
mon code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'o
me
r
geto
o
l:
p
or
t
a
bility f
i
x: do
n
't u
s
e
reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
me
r
geto
o
l:
p
o
r
tabili
t
y fix: do
n
't as
s
u
m
e
true i
s
i
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
merget
o
ol: Don't error
o
ut in the merge case where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergeto
o
l: Replac
e
use of "echo -n"
with printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
Fix minor for
m
atting i
s
sue in man
page for
gi
t
-me
r
getool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theo
d
ore Ts'o
mergetool: p
r
int an a
p
propriate
warning if me
r
g
e
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodor
e
T
s
'o
Ad
d
git-mergetool to run an appropriate merge
c
o
nflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore Ts'o
Add definition o
f
<commit-ish>
to t
h
e main git man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore
T
s'o
A
l
low git-rem
o
te to update n
a
med
g
roups
o
f remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore T
s
'o
Add config_boolean() me
t
ho
d
to the
Git perl mod
u
le
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
h
eodor
e
Ts
'
o
T
e
ach
git-r
e
mot
e
to update
e
xisti
n
g r
e
motes by
f
etching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theod
o
re Ts'
o
All
o
w alia
s
es to expand to shell
commands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
The
o
dore Ts'o
P
r
i
nt
a
sane
error messag
e
i
f
a
n alias expands
t
o a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
T
h
e
o
do
r
e
T
s'o
F
ix formattin
g
for
u
rls section of fetch, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree