repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'fl/config'
2007-07-01
T
h
eodore Ts'o
Don
'
t fflu
s
h(
s
t
dout) when it'
s
not
h
elpful
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-06-10
Theodore Ts'o
git-mergetool: Make defaul
t
s
election of mer
g
e-tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-31
Theodore Ts'o
Fix minor g
r
ammatical typ
o
s
i
n the
g
it
-
gc man page
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Th
e
odore Ts'o
I
ncrease pack
.
dep
t
h d
e
f
a
u
l
t
to 50
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodo
r
e Ts'o
Add 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
Theod
o
r
e Ts
'
o
Re
n
ame warn
(
)
to warning()
t
o fix symbol co
n
flicts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodor
e
T
s'o
merge
t
o
o
l: C
l
ean up description of files and prom
p
ts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
T
heo
d
ore Ts'o
mergetool: Ma
k
e git-rm quiet when
r
esolving a del
e
t
e
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e
Ts'o
mergetool: Add suppor
t
fo
r
A
pple Ma
c
OS
X
'
s
opendif
f
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
Ts
'
o
m
ergeto
o
l:
Fix abort command whe
n
r
esol
v
ing symlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re
T
s'o
merge
t
o
o
l: Remove spurio
u
s error
message if m
e
rge
.
t
o
ol
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore
T
s
'
o
merget
o
o
l
:
f
acto
r
o
u
t
commo
n
code
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mer
g
e
tool: porta
b
i
l
ity
f
ix
:
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
mer
g
etool: portabil
i
t
y
fix: do
n
't assume t
r
ue is in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
ergetool: Don't error out in the
merge ca
s
e where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e
Ts'o
m
e
rgetoo
l
:
Replace us
e
o
f
"echo -
n
" with pr
i
ntf(
1
)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
The
o
dor
e
Ts'o
Fix minor
formatting iss
u
e in man page
f
or git-mergetool
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theodo
r
e
Ts'o
mergetool: prin
t
an ap
p
ropr
i
ate warning if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Th
e
o
dore Ts'o
Add git-merg
e
tool t
o
run a
n
appr
o
priate merge c
o
nflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theod
o
re
Ts'o
Add definition of <commi
t
-is
h
> to the main gi
t
m
a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts
'
o
A
llow git-remote to update named groups of remotes
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts
'
o
A
d
d config
_
boole
a
n() method to
t
he Git perl module
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore Ts'o
Teach git-remote to up
d
ate e
x
ist
i
ng remotes by fetching
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
eod
o
re Ts'o
Allow alias
e
s to expand t
o
shell comma
n
ds
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
m
essage if an alias ex
p
ands to a
n
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theod
o
re Ts'o
Fix formatting for url
s
section o
f
f
e
tch,
p
ull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree