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-recursive: refuse to merge binary files
2007-05-31
Theodore
Ts'
o
Fix minor gram
m
atical typos in the g
i
t-gc ma
n
page
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodore Ts'
o
Increase pack
.
de
p
th default t
o
50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
T
heodore Ts'o
Add pa
c
k
.
depth option to git-
p
ack-objects
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theodore Ts'o
Rename war
n
() to
warni
n
g() to fix symbol conf
l
icts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
The
o
dore T
s
'o
merge
t
o
o
l: Clean up de
s
cription of fil
e
s and pro
m
pts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts'
o
mergetool:
M
ake
git-rm quiet
w
hen resolving a delet
e
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
d
ore Ts'o
merget
o
ol: Add support fo
r
Apple
Mac OS X's opend
i
ff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts'o
m
ergeto
o
l
:
Fix abort co
m
mand
when resol
v
ing symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore T
s
'o
mergetool: Rem
o
ve spurious
error
m
essage if
merge
.
t
o
ol
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
me
r
ge
t
o
ol: fact
o
r
out common c
o
de
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: portab
i
lity fix: don't use reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore Ts'o
merget
o
o
l: por
t
a
b
ility fix: don't assume
tr
u
e is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
mergetool: Don't error
o
ut in the merg
e
case where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
h
eodore T
s
'o
mergetool: Replace use
o
f "echo -n" with
printf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dore Ts
'
o
Fix minor formatting issue in man
p
age for
g
i
t
-
mergeto
o
l
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore Ts'o
mergetool: pri
n
t a
n
appropri
a
te
w
arning
i
f mer
g
e
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore T
s
'o
A
dd git-m
e
r
getool to
run an app
r
opria
t
e
merge confl
i
c
t
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodore Ts'o
Add definition of <
c
ommit-ish>
t
o
t
he main
g
i
t
man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts
'
o
All
o
w git-remo
t
e to upd
a
te n
a
med group
s
of remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
The
o
dore Ts'o
Add co
n
fig_bool
e
an() method t
o
the Git perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
T
h
eodore Ts'o
Teach git-rem
o
te
to
update exi
s
ting
r
emotes by f
e
t
c
hing
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
heo
d
or
e
Ts'o
All
o
w aliases to
e
xpand to shell
c
ommands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
The
o
dore Ts'o
Print a
s
ane
error messag
e
if an
a
lias exp
a
nds to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts'o
F
i
x
formatting for
u
rls
section of fetch, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree