repo.or.cz
/
git
/
trast.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/maint-merge-recursive-r-d-conflict'
2009-01-07
Junio C
H
amano
M
er
g
e bran
c
h 'js/maint-merge-recursive-r-d-con
f
l
i
ct'
commit
|
commitdiff
|
tree
2009-01-07
J
unio C Hamano
Merge branch 'mk/g
i
tweb-feature
'
commit
|
commitdiff
|
tree
2009-01-07
Junio C Hamano
Mer
g
e branch 'cb/merge-
r
ecu
r
sive-f
i
x'
commit
|
commitdiff
|
tree
2009-01-07
J
u
nio
C
Hamano
Merge branch 'kk
/
ma
i
n
t
-h
t
tp-push'
commit
|
commitdiff
|
tree
2009-01-07
Junio
C Hamano
Merge branch 'mv/um-pdf'
commit
|
commitdiff
|
tree
2009-01-07
Junio C
H
aman
o
Merge
branch 'j
n
/gitweb-blame'
commit
|
commitdiff
|
tree
2009-01-07
Junio C
Ha
m
ano
Merge
b
ranch 'wp/add-p-goto'
commit
|
commitdiff
|
tree
2009-01-07
Ren
é
S
charfe
str
b
uf: instate cleanup
r
ule in
c
ase of
n
on-memory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-07
Junio C H
a
mano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-01-07
Junio C Ham
a
n
o
Mer
g
e b
r
anch
'
mai
n
t
-
1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-01-07
Ju
n
i
o C
H
a
m
ano
Mer
g
e br
a
nch 'maint-
1
.
5
.
6' into maint-1
.
6
.
0
commit
|
commitdiff
|
tree
2009-01-07
Joey Hess
REA
D
ME:
t
utor
i
al
.
tx
t
i
s
now
c
alled g
i
ttu
t
orial
.
t
x
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-06
Jun
i
o C Hamano
Merge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2009-01-05
Alexander Po
t
ashev
remov
e
trail
i
ng L
F
i
n
die() mes
s
ages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-05
H
e
nrik Aus
t
ad
Be co
n
sistent in switch
usa
g
e
for
t
ar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-05
Hen
r
ik
A
ustad
Use capital
i
zed
names where appr
o
priat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-05
SZEDER Gábor
bash: add '--m
e
r
ge' to '
g
it reset'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-05
Johannes Schind
e
l
in
sh
o
w <tag>
:
r
e
use pp_user
_
info() inste
a
d of duplicating
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-05
Giuseppe Bilotta
gitweb: use href
(
) when gene
r
ating U
R
L
s in OPML
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-03
M
iklos
V
ajna
fast-export:
print usage
when
n
o o
p
tion
s
specified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-03
Junio
C
Hamano
M
e
rg
e
branc
h
'jc/mai
n
t
-
d
o-not-switch-to-non-commit'
commit
|
commitdiff
|
tree
2009-01-03
Junio C Hamano
Merge branch
'
ap/maint-apply-mo
d
efix'
commit
|
commitdiff
|
tree
2009-01-03
Jun
i
o C Hamano
git checkout
:
do
n
ot allow switchin
g
to a tree
-
ish
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-02
Ju
n
io C Hama
n
o
bu
i
ltin-apply
:
prev
e
nt n
o
n-explicit p
e
r
m
iss
i
o
n
cha
n
ge
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-02
Johannes Schindel
i
n
g
it wrapper: Make while loo
p
more reader-friendly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-01
Junio C Ha
m
ano
M
erge bra
n
ch '
c
b/me
r
getool'
commit
|
commitdiff
|
tree
2009-01-01
Junio
C
Hamano
Merge
b
r
anch 'mai
n
t
'
commit
|
commitdiff
|
tree
2009-01-01
ji
d
anni@jidan
n
i
.
org
Documen
t
ation/git-tag
.
txt: min
o
r
t
ypo and g
r
ammar fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-29
Junio C
H
ama
n
o
Merg
e
bran
c
h 'l
t
/reset-merge
'
commit
|
commitdiff
|
tree
2008-12-29
Junio C H
a
m
ano
M
erge branch 'np/auto-
t
h
read'
commit
|
commitdiff
|
tree
2008-12-29
J
u
n
io C Hamano
M
erge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2008-12-29
Jun
i
o
C
H
aman
o
Pr
e
pare fo
r
v1
.
6
.
1
.
1
main
t
e
n
ance release
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-29
jidanni@jidanni
.
o
rg
Docum
e
ntation/di
f
f
-
op
t
ion
s
.
txt: unify options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-29
Teemu
L
i
k
onen
Fi
x
the
b
uildi
n
g
o
f gitman
.
inf
o
doc
u
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-29
T
e
e
mu Liko
n
e
n
Fix
t
he
b
uilding of user
-
m
a
nual
.
t
exi
a
nd
gitman
.
te
x
i
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-28
D
evin Doucette
g
i
t
web: Fi
x
e
xport
check in g
i
t
_
get_
p
roj
e
cts_
l
ist
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Junio
C
Hama
n
o
Merge bra
n
c
h 'maint
'
commit
|
commitdiff
|
tree
2008-12-27
Junio
C
Hama
n
o
Star
t
1
.
6
.
2 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
J
u
nio C Hamano
Mer
g
e bra
n
ch '
r
s/maint-
t
format
-
foldli
n
e'
into maint
commit
|
commitdiff
|
tree
2008-12-27
Junio
C Hamano
M
e
rge b
r
anch 'rs/main
t
-retval-fix' i
n
to maint
commit
|
commitdiff
|
tree
2008-12-27
Junio C
H
amano
Merge b
r
anch
'
sp/ma
i
nt-describe-all-tag-warn
i
ng'
into
.
.
.
commit
|
commitdiff
|
tree
2008-12-27
A
d
e
o
dato Simó
git-sen
d
-
e
mai
l
.
txt: move --format-pat
c
h paragraph t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Adeod
a
to Simó
g
it-shor
t
log
.
txt
:
im
p
rove docu
m
entation about
.
mailm
a
p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Re
n
é Scharfe
pre
t
ty:
s
upp
o
rt
multiline subjects with format:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René S
c
harfe
pre
t
ty:
f
a
c
tor out f
o
rm
a
t_su
b
ject(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René Scharfe
prett
y
: factor out
sk
i
p_empty_lines()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
R
e
né Scharfe
merge-file: handle
freopen()
failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René
S
charfe
daemon
:
clea
n
u
p:
f
actor out xs
t
rd
u
p_tolower()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
René Scharfe
d
a
emon: cleanup:
r
eplace lo
o
p wi
t
h
if
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
R
e
n
é Schar
f
e
d
a
emon: handle
freopen() failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Sha
w
n O
.
P
e
arce
describe
:
A
v
o
id unne
c
es
s
a
ry
warning when using
-
-all
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-25
Johan
n
es Schindelin
merge-r
e
cu
r
sive: mark rename/delete conflict as unmerged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-25
Kirill A
.
Korinskiy
http-push
:
support full
URI in handle_remote_
l
s_ctx()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-25
Junio C
Hamano
GIT 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-24
Junio C Hamano
M
er
g
e branch
'js/r
e
base-i-p'
commit
|
commitdiff
|
tree
2008-12-24
Johannes Schindelin
r
eba
s
e -i -p: le
a
ve a
-
-cc patch wh
e
n a merge could
.
.
.
commit
|
commitdiff
|
tree
2008-12-23
M
i
klos Vajna
t91
2
9: ski
p
the last three tests if UTF-8 local
e
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Junio
C
H
amano
GIT 1
.
6
.
1
-
rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Richa
r
d
Hartmann
A
l
ways
s
h
o
w wh
i
ch directory is n
o
t a git repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Richard Hartman
n
Make help entries alph
a
betic
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
J
unio C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2008-12-22
B
oyd Stephen Smith Jr
git-rev
e
rt documen
t
a
t
ion: refe
r
t
o
new HOWTO on rev
e
rting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Ro
b
in
Rosenbe
r
g
git-rever
t
: record the
p
arent against which a revert
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Junio
C Hamano
Merge git://git
.
kernel
.
org/pub/s
c
m/gitk
/
gitk
commit
|
commitdiff
|
tree
2008-12-21
Markus H
e
idelberg
doc/g
i
t-fsck: cha
n
ge the way f
o
r getting heads' SHA1s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Markus Heidel
b
erg
Documen
t
ation/git-show-branch: work
a
r
ound
"
sin
g
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Juni
o
C Hamano
send-email:
f
u
t
u
reproof spl
i
t
_
addrs() sub
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Jun
i
o C Hamano
M
ake sure lockfi
l
es
a
re
u
nlocked
w
hen dying on SIGPIPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
René Scharfe
fast-import
.
c:
s
t
ricter strt
o
ul
c
heck, si
l
ence compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
René Schar
f
e
c
o
n
ne
c
t
.
c
:
stricter
port valid
a
tio
n
, s
i
len
c
e comp
i
ler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
N
a
nako Shir
a
i
shi
Add a docu
m
entat on
how to rev
e
rt
a
f
a
ulty merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Kirill A
.
Korinskiy
Remove th
e
r
equirement opaque
l
oc
k
t
oken uri scheme
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Marce
l
M
.
Cary
git-
s
h-setup:
F
i
x
s
cripts w
h
ose PWD is
a
symlin
k
into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
re
b
ase
-i -
p
: Fi
x
--continue after
a
me
r
ge could
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Johan
n
es Sixt
Show a failu
r
e o
f
rebase
-p if the merge ha
d
a
conflic
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus
Heidelberg
Docume
n
ta
t
ion:
fix typos, gram
m
a
r
, asciid
o
c
syn
t
ax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hamano
Merge branc
h
'
m
aint'
t
o
sync with GIT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio
C Ham
a
no
GIT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hamano
f
a
s
t-import
:
m
a
ke
t
agger info
r
mation opt
i
onal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
ohannes Sc
h
i
n
delin
fa
s
t-e
x
port: deal with tag object
s
that do not
h
ave
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Mi
k
los Vajna
Submittin
g
P
a
tches: mention the
u
sa
g
e
o
f real na
m
e in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Dav
i
d Ag
u
i
l
a
r
git-
m
ergetool: properly handl
e
"git mergetool -- filename"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Wu
F
engguang
git-se
n
d
-
e
mail: handle email address with
quoted comma
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Mar
k
us H
e
i
d
elberg
D
o
c
umentati
o
n: fix typos, gram
m
ar
,
ascii
d
o
c
syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-19
Markus Heide
l
berg
Documentation
:
sync example
o
utput with g
i
t o
u
tput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
René Scharfe
Fix
type-mismatch compile
r
warning from
d
if
f
_populate_
f
ilespec()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
M
i
chael J Gruber
t
e
st overlapping ignore patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio
C
Hamano
Merge br
a
nch
'
l
t/readlink'
commit
|
commitdiff
|
tree
2008-12-18
Arjen Laarhoven
Enable threaded de
l
ta searc
h
on
Mac
OS X/Darwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Nanako Shiraishi
Cl
a
rify documentati
o
n of "git
c
h
eckout <tree-ish> paths
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio
C Hamano
M
e
rge git://r
e
po
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
los Vajna
githo
o
ks documentation: ad
d
a
note abou
t
the +x m
o
de
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Haman
o
combine-diff
.
c: us
e
strbuf_readlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C Hamano
builtin-blame
.
c: use strbuf_readlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C
Hamano
make_absolute
_
path(): check
bounds when
s
e
e
ing
a
n ove
r
long
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us T
o
rvald
s
Make
'
prepare_temp_file()' ig
n
ore st_size for symlinks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linu
s
Torva
l
ds
Make
'diff_po
p
ulate_filespec()' use the new 'strb
u
f_rea
d
link()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us Torvalds
Make
'
index_path()' us
e
's
t
rbuf_readlin
k
()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Tor
v
alds
Ma
k
e 'ce_co
m
pare
_
link()
'
u
s
e the new 'strbu
f
_r
e
a
d
lin
k
()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
i
nus Torvalds
Add gener
i
c
'
strbuf_r
e
ad
l
ink()'
h
elper fun
c
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next