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 'jh/checkout-auto-tracking' into maint
2013-10-23
Jun
i
o
C H
a
mano
Merge branch 'jh/
c
heckout-auto-tracking
'
int
o
maint
commit
|
commitdiff
|
tree
2013-10-23
Junio C H
a
m
a
no
Merge br
a
nch 'nd/
f
etch
-
into-shallow
'
into maint
commit
|
commitdiff
|
tree
2013-10-18
Nicol
a
s
V
igier
git-merge: document the -
S
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-17
Junio C Hamano
Start
preparing
f
or 1
.
8
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-17
Junio C H
a
m
a
n
o
M
erge
b
r
anc
h
'
jk/upload-pack-k
e
epalive' into maint
commit
|
commitdiff
|
tree
2013-10-17
J
u
nio C
H
aman
o
Merge branch
'bc/http-b
a
cke
n
d-all
o
w
-
405' into m
a
int
commit
|
commitdiff
|
tree
2013-10-17
Junio C Hamano
Merge bran
c
h 'jc/cvs
s
er
v
er-pe
r
m-
b
it-fix' into maint
commit
|
commitdiff
|
tree
2013-10-17
Junio C Ha
m
a
n
o
Mer
g
e branc
h
'js
/
a
d
d-i
-
mingw' into maint
commit
|
commitdiff
|
tree
2013-10-17
Junio
C
Hamano
Mer
g
e branch 'nd/git-dir
-
p
ointing
-
at-gi
t
file' into
.
.
.
commit
|
commitdiff
|
tree
2013-10-17
Junio C Hama
n
o
M
e
r
ge branch 'jk/h
a
s-sha1-
f
ile-ret
r
y-packed' into
m
a
int
commit
|
commitdiff
|
tree
2013-10-17
Junio
C Hama
n
o
Merg
e
branch 'ap/commi
t
-au
t
hor-ma
i
lmap
'
into mai
n
t
commit
|
commitdiff
|
tree
2013-10-17
J
u
nio C Ha
m
ano
Merge
b
r
a
nch
'es/rebas
e
-
i-no-abb
r
ev
'
into maint
commit
|
commitdiff
|
tree
2013-10-17
Ju
n
io C Hamano
Merge branch 'r
t
/rebase-p-
n
o-merge-summary' into maint
commit
|
commitdiff
|
tree
2013-10-17
Jun
i
o C Hamano
M
erge branch 'es/rebase-i-respect-
c
ore-commentchar
.
.
.
commit
|
commitdiff
|
tree
2013-10-17
SZEDER G
á
bor
t4254: modernize tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-15
Steffen
Prohaska
git-prune-packed
.
t
xt: f
i
x reference
to
G
IT_OBJE
C
T_DIRECTORY
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Junio C Ham
a
no
Start
prepar
i
ng f
o
r 1
.
8
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
J
u
nio C Hamano
Merge b
r
anch 'bc/c
o
mple
t
ion-for
-
b
ash-
3
.
0' into mai
n
t
commit
|
commitdiff
|
tree
2013-09-18
J
unio C Hama
n
o
Merge bran
c
h 'mm/no-shell-esca
p
e
-
in-die
-
message
'
into
.
.
.
commit
|
commitdiff
|
tree
2013-09-18
Junio C Hamano
Merge br
a
nch '
j
l/s
o
m
e
-subm
o
d
u
le-config-are-
n
ot-bo
o
lean
.
.
.
commit
|
commitdiff
|
tree
2013-09-18
Junio
C Ha
m
ano
Merge branch
'
tr/lo
g
-full-dif
f
-
k
e
ep
-
true-parents' into
.
.
.
commit
|
commitdiff
|
tree
2013-09-18
Junio C Hamano
Merge branch
'
jc/transpo
r
t-do-not-use-connect-t
w
ice
.
.
.
commit
|
commitdiff
|
tree
2013-09-18
Junio C Hamano
Merge bra
n
ch 'sp/clip-read-wri
t
e-to-8mb' i
n
to maint
commit
|
commitdiff
|
tree
2013-09-18
Junio C
Hamano
Mer
g
e
b
r
anch
'jk/mailmap-incomp
l
ete-lin
e
'
i
nto maint
commit
|
commitdiff
|
tree
2013-09-17
Eric Suns
h
ine
t320
0
: fi
x
failure on case-insen
s
itive files
y
s
t
ems
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-17
T
ay
R
ay Chuan
t740
6
-submodule-update: ad
d
m
i
ssing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-12
Brian M
.
Carl
s
on
http-ba
c
kend
:
provide Al
l
ow heade
r
for
405
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-12
Junio C H
a
mano
Me
r
ge bran
c
h
'
mai
n
t' of
g
it://github
.
com/git-l10n/gi
t
.
.
.
commit
|
commitdiff
|
tree
2013-09-11
Junio
C
Hama
n
o
cvsserver: pick
u
p
the
right mode bits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-10
Brian M
.
Carl
s
on
send-em
a
il
:
don't
c
all methods on und
e
fined values
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
J
eff King
upload-pack: bum
p
keep
a
li
v
e default to 5 seconds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
Jeff King
upload-
p
a
c
k: send ke
e
pa
l
ive packets
dur
i
ng pack computati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
P
er Cederqvist
branch
.
c: Relax unne
c
e
ssary requirement on upstr
e
am
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
erl
a
nd
t3200: Add test demonstrating minor regression in
41c21f2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Herland
Refer to branch
.
<na
m
e>
.
remote/merge when
documen
t
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
Herland
t3200: Minor fix
when
preparin
g
for tracki
n
g
f
a
ilure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t2024:
F
ix
&
&-cha
i
ni
n
g
a
n
d a couple of typos
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
Matthie
u
Moy
r
e
base: fix run
_
specific_re
b
ase's use of "return" on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-05
Ju
n
io C Hamano
Merge bran
c
h 'nd/fetch-pack-shallow-fix' into m
a
int
commit
|
commitdiff
|
tree
2013-09-05
Jun
i
o C Hamano
Me
r
ge bra
n
c
h 'hv/co
n
fig-from-blob' into maint
commit
|
commitdiff
|
tree
2013-09-05
Junio C Ha
m
ano
Merge branch 'maint-1
.
8
.
3'
into maint
commit
|
commitdiff
|
tree
2013-09-05
Ju
n
io C Ham
a
n
o
Merge br
a
nch 'main
t
-
1
.
8
.
2' in
t
o main
t
-1
.
8
.
3
commit
|
commitdiff
|
tree
2013-09-05
An
d
rea
s
Schwab
Do
c
u
me
n
tation/git-merge
.
t
x
t: fi
x
formattin
g
of example
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-04
Johannes Sixt
add--in
t
e
r
act
i
ve: fix ex
t
e
rnal comm
a
nd invo
c
ati
o
n on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-03
Junio C Hamano
Merge
git://github
.
com/git-l1
0
n/git-po into
maint
commit
|
commitdiff
|
tree
2013-09-03
Ju
n
io C
Ham
a
no
Merge branch 'maint-1
.
8
.
3' i
n
to maint
commit
|
commitdiff
|
tree
2013-09-03
J
u
nio
C
H
ama
n
o
M
erge
branch 'ma
i
nt-1
.
8
.
2' into mai
n
t-1
.
8
.
3
commit
|
commitdiff
|
tree
2013-09-03
Nguyễn Thái Ngọc Duy
Make s
e
tup_git
_
env() resolve
.
git file when $GIT_DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-30
Je
f
f K
i
ng
has_sha1_file: re-c
h
eck pac
k
d
i
r
ectory before giv
i
ng up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-30
Tho
r
s
t
en G
l
aser
fix shell
s
y
n
tax error in tem
p
late
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-28
Ramsay
J
ones
b
u
iltin/f
e
tch
.
c
:
Fix a sparse war
n
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-28
Jeff King
m
a
ilmap
:
h
a
nd
l
e mai
l
map
b
l
o
bs without
trailing newlines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-28
Matthi
j
s Kooijman
A
dd testcase for need
l
ess obje
c
t
s during a shallow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-28
Nguyễn Thá
i
Ngọc
Duy
list-objects: mark more com
m
i
t
s as e
d
g
e
s in m
a
rk_edges_unint
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-28
Nguyễ
n
Thái N
g
ọ
c Duy
list-ob
j
ects:
r
educe o
n
e argument i
n
mark_edge
s
_unin
t
eresting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-28
Nguyễn Th
á
i Ngọc
D
uy
upload-pa
c
k
:
d
el
e
gate rev w
a
lk
i
ng in shallow
fetc
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-28
Ngu
y
ễ
n
Thái Ng
ọ
c
Duy
shallow
:
add
setup_tem
p
orary_sh
a
l
l
ow()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-28
Nguyễn Thái Ngọc
D
uy
shallow: o
n
ly a
d
d shallo
w
graft po
i
n
t
s
to new shallow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-27
Jef
f
K
i
ng
config: do not use C funct
i
o
n
n
ames as struct members
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-26
Junio C Hamano
r
e
base -i: fix
sh
o
r
t SHA-1 collision
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-26
Er
i
c S
u
n
shi
n
e
t3404: reba
s
e -i: demonstrat
e
s
h
ort SHA-1 collision
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-26
Eric Sunshine
t3404:
make tests more self-c
o
n
t
a
i
ned
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-26
N
g
uyễn Thái
N
gọc Du
y
f
e
tch-pack
:
do no
t
rem
o
ve
.
git/shallow file when
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-25
Antoine Pelisse
com
m
it: search aut
h
or patt
e
rn ag
a
i
n
st mai
l
m
ap
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-23
Junio
C
H
am
a
n
o
G
it 1
.
8
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-22
B
r
a
ndo
n
Casey
c
o
ntrib/git
-
p
r
ompt
.
sh:
handle miss
i
n
g
'printf
-
v' more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-21
Brandon
C
asey
t
9
902-completio
n
.
sh: o
l
d Bash still does not support
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-21
B
randon Casey
g
it-completion
.
bash:
u
se correct Bash/Z
s
h array lengt
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-21
Ralf Thielo
w
re
b
a
se --preser
v
e-
m
e
rges: ignor
e
"merg
e
.
log"
config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-21
J
u
nio C Ha
m
ano
Typofix dra
f
t
r
e
lease n
o
tes to 1
.
8
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-20
J
ohannes
Sixt
s
tr
e
a
m
_to_pac
k
: xread does not guarantee to read all
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-20
Steffen Prohaska
Revert "compat/c
l
ipped-write
.
c: l
a
rge
w
rite
(
2
)
fails
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-20
St
e
ffen Prohaska
xread, xw
r
ite: limit
s
ize of IO to 8
M
B
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-19
Jharrod
L
aFon
avo
i
d
segfaul
t
on submodule
.
*
.
path set t
o
a
n
empty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-19
Junio C Hamano
Git 1
.
8
.
4-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-18
Eric Sunshin
e
rebase -i: fix cas
e
s ignoring core
.
commentchar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-18
Nguyễn
Thái Ngọc Duy
move setup
_
alternate_shallow and
w
rite_s
h
allow_
c
ommits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-14
Junio
C Hamano
Rever
t
"
Add
n
ew @
s
hortcut for HEAD"
commit
|
commitdiff
|
tree
2013-08-14
Junio C Hamano
Rev
e
rt "git
s
tash
:
avoid dat
a
loss when "git stas
h
.
.
.
commit
|
commitdiff
|
tree
2013-08-13
Ju
n
io C Hamano
Git 1
.
8
.
4-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-13
Junio C Hamano
Merge
g
i
t://github
.
c
om/git-l10n/git-po
commit
|
commitdiff
|
tree
2013-08-13
Junio C Hamano
M
erge branch '
s
b/mail
m
ap-upda
t
es'
commit
|
commitdiff
|
tree
2013-08-13
Stefan B
e
ller
.
mailmap: Combine more (name, email)
t
o
indi
v
idual
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-13
Junio C
Hamano
.
mai
l
map: update l
o
ng-lost fri
e
nds with multi
p
le defunct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-13
Mat
t
h
i
eu Moy
git-remote-m
e
d
iawi
k
i:
i
gnore generated git-m
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-09
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2013-08-09
Junio
C
Hamano
M
e
rge
b
ra
n
ch 'maste
r
' of git://git
h
ub
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2013-08-09
Junio C Hamano
Merge branch 'jk/submodu
l
e
-
subdi
r
ectory-ok'
commit
|
commitdiff
|
tree
2013-08-09
Junio C
H
amano
Merge branch 'sb/
m
ailmap-updates'
commit
|
commitdiff
|
tree
2013-08-09
S
t
e
fan Beller
.
m
a
ilm
a
p: f
i
xup entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-09
Phil
H
ord
t/t7
4
07: fix two typos in submodule
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-09
Eric Sunshine
parse-options:
f
ix c
l
ang opterror(
)
-Wunuse
d
-value
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-08
Jun
i
o
C Ham
a
no
Git 1
.
8
.
4-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-07
Ju
n
io C Hamano
f
etch: work around "transp
o
rt-ta
k
e-over" hac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-07
Junio C Hamano
f
e
tch
:
refac
t
o
r
code that fetches leftover tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-07
Junio
C Hamano
fetch: refactor co
d
e
t
hat prepa
r
es
a
tra
n
sport
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-07
J
un
i
o C Hamano
fetch: rename file-scope global "transport" to "gtransport"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-07
Junio C Hamano
t
5
802
:
a
dd test for conn
e
ct helper
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-07
Ma
t
thieu
M
oy
die_with_status
:
use "printf '%s\n'",
n
ot "echo
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-08-05
Junio C
H
amano
Sync wi
t
h ma
i
nt
t
o grab trivial
doc fixes
commit
|
commitdiff
|
tree
next