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
heodore Ts'
o
D
o
n't fflush(st
d
out) when it's not helpful
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-06-10
Theodor
e
T
s'o
git-me
r
get
o
ol: Make default s
e
le
c
t
io
n
o
f
merge-tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-31
T
heodore Ts'o
Fix min
o
r gr
a
mmatica
l
t
y
pos in
t
h
e
git-gc man page
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-05-09
Theodor
e
Ts'o
In
c
rease
p
a
c
k
.
depth d
e
fault 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
option to g
i
t-pack-obje
c
ts
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-31
Theodo
r
e
T
s'o
Ren
a
me
warn() to war
n
ing() to fi
x
symbol
c
o
n
fl
i
cts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-30
Theodore Ts'o
m
ergetoo
l
:
Clean up
d
escription of files and p
r
ompts
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
m
e
rge
t
ool: Make git-
r
m
quiet when resolvin
g
a deleted
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Add support for
Apple
Mac OS X
'
s opendiff
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
me
r
g
e
t
ool: Fix abort
command wh
e
n resolving
s
ymlinks
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
m
erget
o
ol: Remo
v
e spurious error me
s
sage i
f
merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetoo
l
: fa
c
tor out common c
o
de
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodo
r
e Ts'o
m
e
rgetool: portabi
l
ity fix: don't use reserved
w
or
d
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theod
o
re Ts'o
mergetool: porta
b
ility fix:
d
on't
as
s
um
e
true
i
s in
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'o
mergetool: Don't erro
r
out in
t
h
e merge ca
s
e
where
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Th
e
odore Ts'o
mergetool: Replace use of
"echo -n" with prin
t
f(1)
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-29
Theodore Ts'
o
F
i
x minor formatt
i
ng issue in man page for
g
it-merget
o
o
l
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-19
Theod
o
re Ts'o
mergeto
o
l: print a
n
appropriat
e
w
arning if merge
.
tool
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-14
Theodore Ts'o
A
d
d git-mergetool
t
o
r
un an appropriat
e
mer
g
e
conflict
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-03-06
Theodor
e
Ts'o
Add de
f
inition of <commit-ish> to the main gi
t
man
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Allow git
-
remote to update
n
a
m
ed
group
s
of remot
e
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-21
Theodore Ts'o
Add conf
i
g_boo
l
ean
(
) method to the G
i
t p
e
r
l
m
odule
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-20
Theodore Ts'o
Teach git
-
rem
o
te t
o
update existing
remo
t
es by fetchi
n
g
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
T
h
eodore Ts'o
Allow aliases t
o
expan
d
t
o
shell command
s
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2007-02-11
Theodore Ts'o
Print a sane er
r
or mess
a
ge if a
n
ali
a
s
expand
s
to an
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree
2006-12-31
Theodor
e
Ts'o
Fix f
o
rmatting for urls section
o
f
fet
c
h
, pull, and
.
.
.
Signed-off-by: "
Theodore Ts'o
" <tytso@mit.edu>
commit
|
commitdiff
|
tree