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 'jc/maint-mergetool-style-fix' into maint-1.7.11
2012-09-11
Ju
n
io C
Ha
m
ano
Merge bran
c
h 'jc/m
a
i
n
t-m
e
rgeto
o
l-s
t
yle-fix'
i
n
to main
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Jun
i
o C Hamano
Merg
e
b
r
anch 'sz/submod
u
l
e
-
force-up
d
ate' into
m
ai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Haman
o
M
e
rg
e
branch 'ph/stash-r
e
r
e
re'
i
nto
m
a
in
t
-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge bra
n
ch 'jc/
m
a
i
nt
-
s
an
e
-e
x
ecvp-n
o
tdir' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io
C
Hama
n
o
Merge branc
h
'
j
c/maint-config
-
exit-status' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C
H
amano
Merge branch 'mh/maint-config-d
o
c-pr
o
xy-comm
a
nd' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
unio C H
a
man
o
Merge branch 'hv/submodule-path-unmatch' in
t
o ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
u
nio
C
Hamano
Mer
g
e branch
'
mz/emp
t
y-re
b
a
se-
t
est' into maint-
1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Junio
C Ham
a
no
Merge b
r
anch 'jk/docs-do
c
book-m
o
n
ospace-display' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Jun
i
o C Hamano
Me
r
g
e
branch 'ab/diff-write-
i
n
c
om
p
lete-lin
e
'
i
nt
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
u
n
i
o C Hamano
Merg
e
br
a
nch 'jc/maint-t7406-r
e
v-parse
-
max-count-huh
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge branch
'
tr/void-
d
iff-setup-done'
into main
t
-1
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Me
r
ge b
r
anch 'tr/m
e
rge-rec
u
r
s
i
ve-flush' int
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio
C
H
a
m
a
no
Merge b
r
anch 'nd/index-errno' into maint
-
1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Jun
i
o C Hamano
Merg
e
branch 'pg/maint-ap
p
l
y
-remo
v
e-unuse
d
-vari
a
ble
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Jun
i
o
C
Hamano
Alm
o
st 1
.
7
.
11
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-10
J
unio C Hama
n
o
Merge branch 'mg/rebase-i-onto-
r
e
flo
g
-i
n
-full
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Merge branch 'jc
/
maint-protect-sh-from-ifs' into
m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C
H
a
mano
Mer
g
e
b
ranch
'bc/receive-pa
c
k
-stdo
u
t-protection' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C
H
amano
Merge bran
c
h 'jk/maint-null-in-tr
e
e
s
' in
t
o
maint-
1
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Merg
e
branch 'tr/maint-send-em
a
il-2
0
4
7
'
in
t
o mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
u
nio C Ham
a
no
Merge branch 'mm/die-with-dash
d
ash-help' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C
H
amano
Merg
e
branch 'js/gitweb-path-info-unquote' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Ju
n
io C Hama
n
o
P
repare for 1
.
7
.
11
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-24
Junio C H
a
mano
Me
r
ge bran
c
h 'mv/pu
l
l-r-for-rebase' i
n
t
o
m
aint-1
.
7
.
1
1
commit
|
commitdiff
|
tree
2012-08-24
Junio C Hamano
M
erge bra
n
ch 'jc/maint-abb
r
ev
-
optio
n
-cli' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Junio C H
a
mano
Mer
g
e
b
ranch 'jc/mai
n
t-rev-list-to
p
o-
d
oc' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Jun
i
o C Haman
o
Merge
branch
'hv/
c
oding-guidel
i
nes' i
n
to maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-08-24
Junio C Hamano
Merge
bran
c
h
'jc/tag
-
doc' int
o
maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-08-24
Junio C Hamano
Mer
g
e branch '
m
k/test-s
e
q' into maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-08-24
Junio C
Hamano
Merge branch 'lp/no-cmd-http
-
fe
t
ch' into maint-
1
.
7
.
11
commit
|
commitdiff
|
tree
2012-08-24
J
unio C Hamano
M
erge branch 'bw/maint-1
.
7
.
9-
s
ola
r
i
s
-ge
t
pa
s
s' into
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Juni
o
C Haman
o
M
e
rge b
r
anch 'jk/main
t
-com
m
it-check-
c
ommi
t
ter-early
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Stefan
Z
ager
Make 'git submod
u
le update --f
o
rce' a
l
w
a
ys chec
k
out
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-24
Junio C Ham
a
no
m
e
rgetool
:
style fi
x
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-24
Eri
c
S
.
R
a
y
mond
Make the ciabot scripts completely self-
c
o
n
figu
r
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-24
E
r
ic S
.
Raymond
Imp
r
oved doc
u
mentation for the c
i
abot scripts
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-22
E
r
i
c S
.
Raymond
contrib/ciabo
t
: Get ci
a
bot configurati
o
n from git variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-18
Jun
i
o
C Hamano
git-config doc:
u
nconfuse an example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-18
Mi
c
ha
e
l Haggerty
git-con
f
ig
.
txt: fi
x
exa
m
ple
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
st
a
sh
:
invoke rerere in case of c
o
nflic
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-17
Phil Hord
test: git-stash conf
l
ict sets
u
p
rerere
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-17
Miklos Vajna
man: git pull -r is a sh
o
r
t
for --re
b
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-17
Junio C Haman
o
gitcli: d
e
scribe abbreviati
o
n o
f
long o
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-15
Juni
o
C
Hamano
Git 1
.
7
.
11
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-15
Junio C Hama
n
o
Merge branch 'rj/
m
aint-gr
e
p
-remove-redu
n
d
ant-test
'
.
.
.
commit
|
commitdiff
|
tree
2012-08-15
Junio C Haman
o
M
e
r
ge bra
n
ch 'hv/li
n
k
-
a
l
t-odb-entry
'
into maint
commit
|
commitdiff
|
tree
2012-08-15
J
u
nio C Hama
n
o
rev-list docs:
c
larify -
-
topo-order d
e
sc
r
iption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-15
Jay
Sof
f
ian
gitweb
:
URL-decode $my_url/$my_uri when
s
tripping
P
ATH_INFO
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-15
H
e
i
k
o
V
oigt
Documenta
t
i
o
n
/Cod
i
ngGuidelin
e
s:
spe
l
l out more shell
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-14
Heiko V
o
igt
Let su
b
modul
e
co
m
m
a
n
d exit with error
s
ta
t
us if path
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-10
Michae
l
J Gruber
re
b
ase
-
i
:
use full ont
o
sha1 in
reflog
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-09
M
a
rtin von Zweigbergk
add tests for 'g
i
t rebase --
k
eep-empty'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-08
Junio
C
H
amano
sh
-
s
e
tup:
p
r
otec
t
from e
x
p
o
rted IFS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-07
Jeff K
i
ng
docs: monospace
l
isting
s
in docbook output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-07
J
uni
o
C Hamano
r
e
ceive-pack:
d
o
not leak output fro
m
auto-gc to st
a
n
dard
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-07
Brandon Ca
s
e
y
t/
t
5400:
dem
o
n
strate b
r
eak
a
ge caused by
i
nformational
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-07
Ben Walton
Enable HAVE_DEV_TTY
f
or
S
olaris
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-07
Jeff King
terminal: seek wh
e
n swi
t
ching bet
w
een reading and writin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-06
J
unio C Hamano
P
repare for 1
.
7
.
11
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-06
J
unio
C
H
a
mano
Merge
branch 'jn/block-sha
1
' i
n
to maint
commit
|
commitdiff
|
tree
2012-08-06
Junio C Haman
o
Merg
e
branch '
j
n
/
make
-
assembly
-
in-right-directo
r
y'
.
.
.
commit
|
commitdiff
|
tree
2012-08-06
Junio C Hamano
M
e
rge branch 'ms/daemon-doc-typo'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-08-06
J
unio C Haman
o
M
erge br
a
nch 'lm/git-blame-e
l
' in
t
o
maint
commit
|
commitdiff
|
tree
2012-08-06
Junio C Ha
m
ano
M
e
rg
e
branch 'rs/ipv6-ssh-url' into mai
n
t
commit
|
commitdiff
|
tree
2012-08-06
J
u
nio C Hamano
Mer
g
e b
r
anch 'rs/
g
it-blame
-
mapcar-mapc' in
t
o maint
commit
|
commitdiff
|
tree
2012-08-06
Junio C Ha
m
ano
Merge branch 'rr/doc-commit
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-08-06
Štěpá
n
Němec
doc: A few minor copy edi
t
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-06
Jun
i
o
C Hama
n
o
M
erge br
a
nch
'jk/maint-che
c
kout-or
p
han-c
h
eck-fi
x
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-08-06
Junio C
Hamano
Merg
e
b
r
a
n
ch 'mh/
m
aint-re
v
isions-do
c
' into maint
commit
|
commitdiff
|
tree
2012-08-06
Junio C Hamano
Merg
e
branch '
j
c/m
e
r
g
etool-tool-help' into maint
commit
|
commitdiff
|
tree
2012-08-06
Junio C Hamano
Document
a
t
i
on
:
do not menti
o
n
.
git/refs/* dire
c
tories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-06
Nguyễn Thái Ngọc Duy
r
ead_
i
ndex_from: remove bogus errno assign
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-05
Paul
G
ortmaker
a
pply: delet
e
unused deflate_origlen
f
r
o
m patch struct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-05
Ad
a
m Butcher
Fix '
\
No newline
.
.
.
'
annotation in rewrite
d
iffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-04
Michał Kiedrowicz
tests
:
Introduce te
s
t_se
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-03
T
h
o
mas Rast
merge-recurs
i
ve: eliminate f
l
u
sh
_
buff
e
r() in favo
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-03
T
h
omas Rast
diff_set
u
p_done(): return vo
i
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-03
Matthieu Moy
setu
p
: clarify error messa
g
es
f
or file/
r
evisi
o
ns am
b
i
guity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-31
Tho
m
as Rast
send-
e
mail: improve RFC2
0
47 quote pars
i
ng
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-31
Junio C H
a
mano
s
a
ne_execvp(): ign
o
re no
n
-directory on $PATH
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-30
Juni
o
C Hamano
Git 1
.
7
.
11
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-30
Junio C
H
amano
Merge br
a
nch 'jk/m
a
int-c
o
m
m
it-document-editmsg' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Junio
C
H
amano
Mer
g
e br
a
nch '
j
k/maint-advise-vaddf' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2012-07-30
Junio C Ham
a
no
Merge branch
'
kk/maint-com
m
i
t
-tree'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2012-07-30
Junio C Hamano
Me
r
ge branch 'j
v
/mai
n
t
-no-ext-
d
iff' into maint
commit
|
commitdiff
|
tree
2012-07-30
Ju
n
io C Hamano
Merge branch 'pg/maint-1
.
7
.
9-
a
m-where-is-patch
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Junio C Hamano
Merge branc
h
'
j
l/
m
ai
n
t-1
.
7
.
10-recurse-submodules-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Junio C Hamano
Merge branch
'
jc
/
m
a
int-filt
e
r-
b
ranch-ep
o
ch-date' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Junio C Hamano
t7406: fix misleading
"rev-pars
e
--max-count=1
HEAD"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-30
J
u
ni
o
C
H
amano
config:
"git config baa" should
e
xit with
s
t
a
tus 1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-30
Ramsay Jones
t7810-*
.
sh:
R
e
m
o
v
e
r
ed
u
ndant test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-30
Hei
k
o
Voigt
link_alt_odb_entry
:
fi
x
read over arr
a
y
b
ounds repo
r
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-29
Jeff
K
ing
f
s
ck: dete
c
t null sha1 in tree entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-29
Jeff King
do
not write null
sha1s to on-d
i
sk index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-29
Jeff King
diff: do n
o
t use null sha1 as a sentinel value
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-25
J
e
ff King
ch
e
cko
u
t: do
n
't
confuse
r
ef and o
b
jec
t
flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-24
Ju
n
io C Hamano
E
n
u
m
erate
r
evision
r
ange sp
e
cifiers in t
h
e documen
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
Jeff
K
ing
commit: document the temporary
commit message f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
Junio C
H
a
mano
mergetool: support -
-
t
ool-h
e
lp opt
i
on like difftool
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next