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 'mh/cherry-default'
2008-12-21
Kirill
A
.
Korinskiy
Re
m
ove the requi
r
ement
o
paquelocktoken uri
sc
h
eme
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
M
arcel M
.
C
ary
git-sh-set
u
p
:
F
ix
s
cripts
w
hose PWD
is
a
sy
m
link into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Sixt
rebase -i -p: Fi
x
--conti
n
u
e
after
a
merge could no
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes S
i
x
t
Show a
failure of rebase -p if the m
e
r
g
e had a
c
o
nfl
i
ct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Ma
r
kus Heidelberg
Doc
u
mentation:
fix typ
o
s,
grammar, asciidoc syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C
H
amano
Merge bra
n
ch 'main
t
' to s
y
n
c with
GIT
1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
J
u
n
io C
H
amano
GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Jun
i
o C
Ha
m
a
n
o
f
a
st
-
i
mport
:
make tagger
i
n
formation optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Johannes
S
chindelin
fa
s
t-export: dea
l
w
i
th
tag ob
j
ec
t
s that
do not have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
SubmittingPatches: mention the usage o
f
real name in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
David A
g
uil
a
r
git-mergetool: p
r
operly handle "git
m
e
rg
e
tool -- filename"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fengguang
git-
s
end-email:
h
a
ndle emai
l
address with quoted
comma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Mar
k
u
s Hei
d
elberg
Do
c
umentation: fi
x
typo
s
,
grammar, a
s
ciidoc
s
yntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
M
arkus Heidelberg
Documentation: sync exam
p
le output with
git output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René
Scharfe
Fix type
-
mis
m
atch
co
m
piler warning from diff_pop
u
la
t
e_files
p
e
c()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Michael J Gruber
tes
t
overlapping ignor
e
pat
t
erns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Ju
n
io C H
a
mano
Merge branch
'
l
t/rea
d
l
i
nk'
commit
|
commitdiff
|
tree
2008-12-18
Arjen Laarh
o
ven
Enable
t
hrea
d
ed delta search on Mac OS
X
/Darwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Nanako
S
hiraish
i
C
l
ar
i
fy documentation o
f
"git c
h
e
c
kout
<
t
ree-is
h
>
p
aths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
M
e
rge git://repo
.
or
.
cz/
g
it-
g
u
i
commit
|
commitdiff
|
tree
2008-12-17
M
i
klos Vajna
g
i
thooks documentation: add a
n
ote about th
e
+
x
m
o
de
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
combine-diff
.
c: use strb
u
f_readlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C H
a
m
a
no
b
uilt
i
n
-blame
.
c: use strbuf
_
readlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C Ha
m
ano
m
ake_ab
s
olute_path(): check bounds when seeing a
n
overlo
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us
T
orvalds
Make
'
prepa
r
e_temp_file(
)
' igno
r
e st_size for symlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
i
n
us Tor
v
ald
s
Mak
e
'diff_popula
t
e_filespec()'
u
se the new
's
t
rbuf_readlin
k
(
)'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus T
o
rvalds
M
ake
'index_path()' use 's
t
rbu
f
_
r
eadlink
(
)'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us Torvalds
M
a
ke 'ce_compare_link()' use
the ne
w
's
t
r
buf_readl
i
n
k()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
inus Torva
l
ds
Add g
e
neric 'strbuf_rea
d
link()' he
l
per functi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Markus
H
ei
d
elberg
doc/git-rese
t
: add reference to git-st
a
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
M
a
rkus Hei
d
elb
e
rg
Do
c
ume
n
tat
i
on: fix description for enabl
i
ng hooks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon
d
o
c
ument
a
tion: use {tilde}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hama
n
o
gitweb: do not
run "gi
t
dif
f
" that is P
o
rcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C H
a
mano
GI
T
1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C Hamano
G
I
T 1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C Hamano
G
IT 1
.
5
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C Ha
m
ano
gitwe
b
: d
o
not run "git di
f
f
"
t
hat is
P
orcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Mar
l
ow
bash c
o
mpletion: Sync
c
on
f
ig v
a
riables with th
e
ir man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
bash c
o
mp
l
etion:
Sort c
o
nfig complet
i
o
n vari
a
bles
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio C
H
aman
o
Merge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2008-12-16
Johanne
s
Schi
n
de
l
i
n
fast
-
import: clos
e
pack before unlinking it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
M
att
Kraai
g
itweb: unify boolean feature subrouti
n
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schi
n
delin
For
c
e t5
3
02 to use a single thread
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Ju
n
io C
Hama
n
o
Merge branch 'cb/maint-merge-recursive-fix' into
cb
.
.
.
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
mer
g
e
-
r
ecursive: do not clobb
e
r
untracked worki
n
g tree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Cle
m
en
s
B
ucha
c
h
e
r
modi
f
y/delete conf
l
ict resolution overwr
i
te
s
unt
r
acked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C H
a
mano
pag
e
r: do not du
p
2 stderr if it i
s
already redirected
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
J
u
n
io C Haman
o
git-show: do not se
g
fa
u
lt when sh
o
wing a b
a
d tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
J
ohannes
Sch
i
n
de
l
in
Get rid of
th
e
last remn
a
nts of GIT_CONFIG_LOCAL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Al
e
xander Gavrilov
Documentation: Describe gi
t
-gui Tools menu configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Y
ONETANI
T
omokazu
git-
f
a
s
t-
i
mport
pos
s
ibl
e
memory corruption
p
r
oblem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-14
Nicolas Pi
t
re
pac
k
-objects: do
n
'
t
u
se too many threads with
f
ew
o
bjects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Markus
H
e
i
d
e
lberg
builtin-com
m
it:
remov
e
u
nused messag
e
v
ar
i
able
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Junio C
H
amano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-12-13
C
harles Bailey
mergetool: Do
n
't
keep temporar
y
me
r
g
e
files unless
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
merge
t
oo
l
: Add prompt to c
o
ntin
u
e
aft
e
r
fail
i
ng to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Brandon
Casey
git-bra
n
c
h: dis
p
lay
s
ha
1
on b
r
anch deletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyering
git-config
.
txt: fix a
ty
p
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Nicolas Pitre
a
u
t
o
detec
t
n
umber of CPUs by d
e
fault whe
n
u
s
ing t
h
r
eads
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
J
unio C Hamano
Merge b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-12-11
Li
n
us Tor
v
a
lds
fsc
k
: reduce stack
f
ootpr
i
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jakub Nare
b
ski
gitweb: cache
$parent_commit info in git_blame(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Miklos Vajna
Add support for a p
d
f
version of
t
he
u
ser m
a
nual
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
rebas
e
: improve error me
s
sages about dirty state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Nicolas
Pit
r
e
make sure packs t
o
b
e
replaced
a
r
e
c
los
e
d befor
e
h
and
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexan
d
e
r Potashe
v
Fix typo in
c
omment in b
u
il
t
in
-
add
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
J
u
ni
o
C Ham
a
no
F
i
x
t4031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jakub
Nare
b
s
k
i
gitw
e
b: A bit of code
c
leanup in git_blame()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Jeff Ki
n
g
diff: r
e
s
p
ect textconv in rewr
i
te diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff:
f
ix ha
n
dling of
bin
a
ry rewri
t
e di
f
fs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ja
k
ub Narebski
gitweb: Mo
v
e 'lineno' id
f
rom link t
o
row
e
lement in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Document "git-r
e
s
e
t --merge"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Al
e
xander Potashev
Fix
t
y
p
os in documen
t
atio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Tor
A
rvid Lun
d
gi
t
-p4:
F
ix regression
i
n p4Where method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
R
a
lf Wildenhues
Improve language in git-merge
.
t
x
t
and rel
a
ted docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
work aro
u
nd P
y
t
hon war
n
i
ngs
f
r
om AsciiDoc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Alexey B
o
rzenkov
D
e
f
ine link
g
it macro
in [macr
o
s]
section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Des
k
in
M
iller
git-svn: Make
f
ollowi
n
g p
a
rents atomic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jaku
b
Nar
e
b
ski
gitw
e
b: Fix bug in insert_file
(
)
s
ubroutine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff Ki
n
g
dif
f
:
a
llow turni
n
g on textconv expl
i
citly for
p
lumbing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff
K
ing
reorder A
L
LOW
_
T
E
X
T
CONV opti
o
n sett
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
unio C Hamano
read-cache
.
c: ty
p
ofix
i
n comm
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
builtin-ch
e
ckout
.
c: check err
o
r ret
u
r
n
f
r
om
r
e
a
d_cac
h
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
H
amano
Poi
n
t "stale" 1
.
6
.
0
.
5 documen
t
ation fr
o
m the main
g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio
C Hamano
Re
v
ert
"gi
t
-stash:
u
se git rev-pa
r
se -q"
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hama
n
o
Update draf
t
release no
t
es for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
Merge branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2008-12-07
J
unio C Hamano
GIT 1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Mat
t
M
c
C
utchen
"g
i
t diff <tree>
{
3
,}": do not reverse order of arguments
commit
|
commitdiff
|
tree
2008-12-07
Jeff
King
tag: d
e
lete TAG
_
E
DITMSG
o
nly on succ
e
ssful tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jakub Nare
b
ski
gitweb: Make pr
o
ject specific override fo
r
'gr
e
p
' feat
u
re
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Miklos
Vajna
http
.
c
:
use 'git_
c
onfig_string' to get 'curl_h
t
tp_proxy'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Thomas Rast
fetch-pack: Avoid me
m
cpy() with src==ds
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
Update d
r
af
t
release notes to 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio C
H
am
a
no
Merge branch '
j
c/am-o
p
t
i
ons'
commit
|
commitdiff
|
tree
2008-12-06
Junio C Ham
a
no
git-
a
m:
r
ename apply_opt_extra fi
l
e to apply-
o
pt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
J
uni
o
C Hamano
T
e
st that gi
t
-am do
e
s no
t
los
e
-C/-p/--whitespace
o
ptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Ju
n
io C
H
amano
git-am: prop
a
gat
e
--3wa
y
options as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
git-am
:
propagate
-
C<n>, -
p
<
n
> option
s
as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next