repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'rr/test-use-shell-path-not-shell' into maint
2012-09-11
Junio C Haman
o
blame: allow "blame file"
i
n the middle of a confl
i
cted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Further merging down f
o
r
1
.
7
.
12
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Sync with 1
.
7
.
11
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C
Hama
n
o
Merge bran
c
h 'j
s
/u
s
e-sc-open-ma
x
' in
t
o
maint
commit
|
commitdiff
|
tree
2012-09-11
J
un
i
o C
Hamano
Me
r
ge
b
ranch 'js/no-curl-
e
asy-strerror-on-old-curl
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
u
n
io C Hamano
Git 1
.
7
.
11
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C Hamano
Merge bra
n
c
h
'jc/mai
n
t-mergetool-style-
f
ix' i
n
to maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio
C Haman
o
Merge branch 'sz/su
b
module-force-upd
a
te' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
J
unio C Ham
a
no
Merg
e
branch 'ph/stash-rerere' into maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Junio C Ha
m
ano
Merge branch
'
jc/m
a
int-s
a
ne-ex
e
cvp-notdir' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge branch 'jc/maint-confi
g
-exit-st
a
tus
'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C Hamano
Merge
branch '
m
h/maint-con
f
ig-d
o
c
-
proxy-command' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C
H
a
m
ano
Me
r
ge branch
'
hv/submodule-path
-
unmatch
'
into
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge
b
r
a
nch 'mz/empt
y
-rebase-test' into maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
i
o
C
Ham
a
no
Merge branch '
j
k/do
c
s-docbo
o
k-m
o
nospace
-
di
s
p
l
ay' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Merge b
r
anch
'ab/diff-wr
i
te-incom
p
l
e
te-line
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C
H
amano
Mer
g
e
branch 'j
c
/main
t
-t7406-rev-parse-max-
c
o
u
nt-huh
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hama
n
o
Merge bra
n
ch 'rr/p
r
ecompose-ut
f
8-cleanup
'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
M
erge
branc
h
'j
c
/capabilit
i
es' into main
t
commit
|
commitdiff
|
tree
2012-09-11
Juni
o
C
Ha
m
a
n
o
Merge branch 'jc/doc-git-up
d
at
e
s' i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2012-09-11
J
u
n
io C Hama
n
o
Merg
e
branch '
j
k/che
c
k-docs-up
d
ate'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-09-11
Junio C Hamano
Me
r
g
e
branc
h
'tr/void-diff-setu
p
-
done' into maint-1
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Junio
C
Hamano
M
e
r
ge branch
'tr
/
mer
g
e-recur
s
ive-f
l
ush' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io
C
Hamano
Merg
e
b
r
anch 'nd/index-errno' into main
t
-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-11
Junio C
H
amano
M
e
rge branch
'pg/maint-apply-rem
o
ve-u
n
u
s
e
d
-variable
.
.
.
commit
|
commitdiff
|
tree
2012-09-11
Ju
n
io C
H
amano
Me
r
ge bran
c
h 'jc/tes
t
-prer
e
q' into maint
commit
|
commitdiff
|
tree
2012-09-11
Dav
i
d Gould
run-command
.
c: fix brok
e
n lis
t
i
t
eration in c
l
ear_child_for_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-11
J
unio C
H
amano
bla
m
e $path
:
avoid getting fooled by
c
ase insensitive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Jun
i
o C
H
amano
Start preparing for 1
.
7
.
12
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
J
u
n
io C Hamano
M
erge branch 'b
c
/
p
ru
n
e-info
'
into main
t
commit
|
commitdiff
|
tree
2012-09-10
J
unio C H
a
man
o
Merge branch 'maint
-
1
.
7
.
11' into maint
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Almost 1
.
7
.
11
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Merge branch 'mg/rebase-i-onto-reflog-in-
f
ull' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
unio C Haman
o
Merge br
a
nch 'jc/maint-protect-sh-fr
o
m-ifs' in
t
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio
C
Hamano
Merge
b
ranch '
b
c/rec
e
ive-pack
-
stdout-protection' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Merge branch 'jk/maint-nu
l
l-in-trees' i
n
to maint-1
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Merge branch 'tr/maint-send-e
m
ail-2047' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Me
r
g
e
branch 'mm/die-
w
ith-dashdash-h
e
l
p
' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio
C Hamano
Merg
e
branch 'js/gitweb
-
path-inf
o
-unquote' into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
unio C
H
amano
gi
t
c
li: contrast wildca
r
d g
i
ven
to shel
l
and to git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Junio
C Hama
n
o
git
c
l
i
: f
o
rmatting
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
Junio C Hama
n
o
m
a
i
l
i
nfo:
st
r
ip "RE: " prefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
J
u
nio
C
Hamano
a
tt
r
: "bina
r
y
"
a
ttri
b
u
te shou
l
d choos
e
built
-
in "binary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
J
u
ni
o
C H
a
man
o
merg
e
: teach -Xours/-
X
theirs to
b
i
n
ary
l
l-merge driver
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
D
a
vid Aguilar
gitk: Rename
'
t
a
gcontent
s
' t
o
'
c
ached_
t
ag
c
o
nte
n
t
'
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d Agu
i
lar
gitk:
T
each "Rer
e
ad refere
n
ces" to reload tags
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-07
S
t
efan Naewe
l
s
-remot
e
:
docume
n
t
the '--ge
t
-url' option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-07
D
an Johnson
fetch --all: pass --tags/--no-tags through to each
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-06
Stephe
n
Boyd
send-ema
i
l
:
i
nitial_to
and
i
ni
t
ial_reply_to are both
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-06
Nguyễ
n
Thái Ngọc Duy
doc: move rev-
l
i
s
t option -<n>
f
rom git-log
.
txt to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-06
Nguyễn Thái Ngọc Duy
remote
:
prefer
s
u
b
command name 're
m
ove'
t
o 'rm'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-04
Junio
C
H
a
mano
D
o
cum
e
n
t
file-glob for
"
gi
t
checkout -- '*
.
c'"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-03
Je
n
s Lehmann
s
ubmo
d
u
le:
u
s
e arg
v
_
array
instead of hand-building
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-03
Jeff King
f
e
tch
:
u
s
e argv_arra
y
instead o
f
h
a
nd-
b
u
ildi
n
g
arr
a
ys
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-03
Jeff King
argv-
a
r
ray: fix bogus cast when freeing array
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-03
Jeff K
i
ng
argv-a
r
ray:
a
d
d
pop function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-03
R
ams
a
y Jones
test-regex: Add a
t
est to ch
e
ck for a
b
u
g i
n
the rege
x
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Junio C Hamano
spli
t
_iden
t
_
l
ine(): make
best effort when
parsing aut
h
o
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-30
Martin v
o
n Z
w
eigbergk
cherry-pick
/
revert: respect order of r
e
visions to pi
c
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweig
b
e
rgk
demons
t
rate broken 'g
i
t cherry-pick three one
t
wo'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigbergk
teach l
o
g -
-
no-walk=unsorted, which
avoids sor
t
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-28
Jeff King
log: fix --quiet synonym for -s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-27
Jeff King
http
:
prompt for creden
t
ials on failed POST
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-27
Jeff
King
http:
factor
o
ut http erro
r
co
d
e handli
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-27
Jeff
K
i
ng
t
:
test http
a
ccess to "hal
f
-auth" r
e
po
s
itori
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-27
J
e
ff King
t:
test basic
smart-
h
ttp authentication
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-27
Jeff King
t
/
lib-httpd: recognize
*/s
m
art
/
* repos as smart-http
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-27
Jeff King
t/lib-
h
ttpd
:
only route auth
/
dumb to dum
b
repos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-27
Jeff King
t
5
550: factor
o
ut http auth
setup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-27
Jeff Ki
n
g
t
5
550: put a
u
th-
r
equire
d
repo in
a
uth/dum
b
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-26
Junio
C Hamano
doc: "git
checkout
-
b/-B/--orphan" always take
s
a branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-25
Junio C
H
amano
apply: com
p
ute
p
atch->
d
ef_nam
e
cor
r
ectl
y
un
d
er -
p
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-24
Ju
n
i
o
C
H
a
mano
Merge branch 'ma
i
nt-1
.
7
.
1
1
' int
o
maint
commit
|
commitdiff
|
tree
2012-08-24
Junio C
Hamano
P
repa
r
e
for 1
.
7
.
11
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-24
Junio C Ha
m
ano
Merge b
r
a
n
ch
'
m
v/pull-r-f
o
r-rebas
e
' i
n
t
o maint-
1
.
7
.
1
1
commit
|
commitdiff
|
tree
2012-08-24
J
u
nio C Hamano
M
e
rge br
a
nch 'jc/maint-abbrev-option-
c
li' int
o
mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
J
unio C
H
ama
n
o
Merge bran
c
h 'jc/m
a
in
t
-re
v
-l
i
s
t
-
t
opo-doc'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Junio C Hamano
Merge branch 'hv/coding-guide
l
ines' into maint-
1
.
7
.
11
commit
|
commitdiff
|
tree
2012-08-24
J
unio C Hamano
Merge branch 'jc/tag-doc' into
m
aint
-
1
.
7
.
11
commit
|
commitdiff
|
tree
2012-08-24
Junio C Hamano
Me
r
ge branch 'mk/test-seq' into
maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-08-24
J
u
nio C Hamano
Merg
e
branch
'lp/n
o
-cmd-http-
f
etch' in
t
o
maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-08-24
Jun
i
o
C
Hamano
Merge
branch
'
b
w/m
a
int-1
.
7
.
9-sola
r
i
s-getpass' into
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Junio
C
Hamano
Merge br
a
nch 'jk/m
a
int-commit-chec
k
-committer-early
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Joachim Schmit
z
sha
1
_file
.
c: i
n
trod
u
ce get
_
max_f
d
_limit
(
) he
l
per
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-24
Stefan Zager
Make 'git
submodu
l
e update --force'
always check out
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-24
Junio C Ha
m
ano
mer
g
etool: sty
l
e
fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-24
Eric S
.
R
a
ymond
Make t
h
e cia
b
ot scripts complet
e
ly self-conf
i
guring
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-24
E
r
ic
S
.
Raymond
Im
p
roved docum
e
nta
t
ion fo
r
the
c
iabot scripts
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-23
Ju
n
io C Hamano
specifying
range
s
:
w
e
d
id not mean to mak
e
"
.
.
" an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-23
Joachim Schmitz
ht
t
p
.
c: don
'
t use
curl_e
a
sy_strer
r
or
p
rio
r
to curl
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-22
Michael
J
Gruber
t3910: use
t
he UTF8_NFD_TO_NFC test prere
q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-22
Junio
C
H
aman
o
Merge bra
n
ch
'
m
a
int-1
.
7
.
11' into maint
commit
|
commitdiff
|
tree
2012-08-22
Eric S
.
Raymo
n
d
contrib/ci
a
bot: G
e
t
ciab
o
t config
u
ration fr
o
m
git variab
l
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-22
Eric S
.
Ra
y
mond
f
a
st-impor
t
: document
the
--done o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-21
J
unio C Hama
n
o
warn_on_inac
c
essible(
)
:
a
h
elper to warn
on
ina
c
cessible
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-21
Jeff
K
ing
att
r
: wa
r
n on inaccessible at
t
ribute files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-21
Jeff
K
ing
gitig
n
ore: report access errors of e
x
clude
f
iles
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-21
Jeff
King
config: w
a
rn on inaccessible
f
iles
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-21
K
a
cper Kornet
for-each-ref: Fix sort with mu
l
t
i
p
l
e
keys
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-21
Kacper Kornet
t630
0
:
t
e
s
t
sort wi
t
h mult
i
ple k
e
ys
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next