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
Merge branch 'jc/quote'
2007-07-01
Theo
d
ore Ts'o
D
o
n't fflush(s
t
dout) whe
n
it's not
h
elpful
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-06-10
Theo
d
ore
Ts'o
git-
m
e
r
g
e
tool: M
a
ke default se
l
e
c
tion of merge-
t
ool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-31
Theodor
e
Ts'o
Fix min
o
r
grammatical typ
o
s in the git-gc man pa
g
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theod
o
re Ts'o
Incre
a
se pack
.
depth d
e
f
au
l
t to
5
0
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
T
heo
d
ore Ts'o
Add
pack
.
depth option
to git-pack-objects
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theod
o
re Ts
'
o
Rename w
a
rn()
t
o wa
r
ning() to fix sy
m
bol conflic
t
s
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
merg
e
tool: Clean
u
p
d
escription of files and prompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heod
o
re Ts'o
mergetool: Make git-rm q
u
iet
when resolv
i
n
g a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e
T
s
'o
me
r
g
e
tool:
A
dd suppor
t
for Apple Mac OS X's
o
pendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergeto
o
l: Fix
a
b
ort comma
n
d when
resolvi
n
g symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s'o
m
e
r
g
eto
o
l: Remove
spurious error messa
g
e if merge
.
to
o
l
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
o
d
ore Ts'o
m
ergetool:
fact
o
r ou
t
common code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
merg
e
tool: po
r
tabi
l
i
ty fix:
d
on't use reserved word
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
merge
t
oo
l
: portability fix: don't as
s
ume tr
u
e i
s
in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Don't error
o
ut in
the
m
erg
e
case where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Replace use of "
e
cho -n" with p
r
intf(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
Fix minor format
t
i
n
g iss
u
e i
n
man page for git-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodore T
s
'o
mer
g
etool: print
a
n app
r
o
p
riate warning i
f
merge
.
t
o
ol
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
Add
g
i
t
-m
e
rgetool to run
a
n
ap
p
rop
r
i
a
te me
r
ge con
f
lict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
T
heodor
e
Ts'o
A
dd de
f
in
i
tion of <
c
ommit-
i
s
h
> to
t
he main git ma
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Allow
git-r
e
mote
to
u
pdate named
g
r
o
ups o
f
remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theo
d
o
r
e Ts'o
Ad
d
config_boolean()
method t
o
the Git perl m
o
d
u
l
e
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodor
e
Ts'o
Teach git-remote to
update e
x
isting r
e
mo
t
es by fetc
h
ing
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore
T
s'o
Allow a
l
iases to expand to s
h
e
l
l
c
ommands
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore T
s
'o
Print a sane er
r
or messa
g
e if
a
n a
l
ias ex
p
an
d
s to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodore Ts
'
o
Fix format
t
in
g
for url
s
section of fetch, pull, an
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree