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 'zj/upstream-error-message'
2012-04-24
Junio
C
H
amano
Me
r
ge
b
ranch 'zj/upstream-error-message'
commit
|
commitdiff
|
tree
2012-04-24
J
u
nio C Hamano
Merge branch '
m
k/gitwe
b
-
d
iff-hl'
commit
|
commitdiff
|
tree
2012-04-24
Junio C
H
aman
o
M
e
rge br
a
nch 'it/fe
t
ch-p
a
ck
-
many-refs'
commit
|
commitdiff
|
tree
2012-04-24
Ju
n
io C Haman
o
Merg
e
branch 'pw/fast-import-d
a
tar
e
f-par
s
in
g
'
commit
|
commitdiff
|
tree
2012-04-24
Junio C Hamano
M
e
rge branch '
m
h/ref-api'
commit
|
commitdiff
|
tree
2012-04-24
Junio C Hamano
Merge branch
'hv/submodu
l
e-r
e
curse-pu
s
h'
commit
|
commitdiff
|
tree
2012-04-23
J
unio C H
a
mano
R
e
l
Notes:
t
he f
o
urth batch of topics gr
a
duate
d
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-23
J
u
n
i
o C
Hamano
Merge
b
ranch 'bw/test-fix-g
r
ep
-
gnuism'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Hamano
Mer
g
e branch 'r
j
/submodule-m
s
win-pat
h
'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Haman
o
M
e
rge branch 'rj/s
h
-se
t
up-mswin
-
pwd'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Hama
n
o
Merge
branch 'rj/mi
n
gw-is
g
uid'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Hamano
Merge branch 'jn/fast-import-doc
'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Hamano
M
e
rge branch 'jn/more-i18ncmp'
commit
|
commitdiff
|
tree
2012-04-23
Juni
o
C
H
a
m
ano
Merge branch
'
j
l/maint-su
b
module-recurse-fet
c
h'
commit
|
commitdiff
|
tree
2012-04-23
Juni
o
C
H
amano
Mer
g
e branch 'jc/maint-b
l
ame-minimal'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Haman
o
Merge
bra
n
ch '
l
p/maint-dif
f
-
three-dash-with-graph'
commit
|
commitdiff
|
tree
2012-04-23
J
u
n
io C
H
amano
Merg
e
branch 'rs/commit-li
s
t-sort-in-batch'
By René Scharfe (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-23
Junio C Haman
o
Merge branc
h
'
jh/appl
y
-
f
ree
-
patc
h
'
By
Junio C Hamano
(8) and Jared Hance (1)
commit
|
commitdiff
|
tree
2012-04-23
J
u
nio C Ha
m
ano
Mer
g
e
br
a
nch
'
sl/t
e
st-wc-l-line-count'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Hamano
Merge
b
ranch 'jn/debian-customizes-defa
u
lt-edi
t
or'
commit
|
commitdiff
|
tree
2012-04-23
Junio
C
Hama
n
o
Merge bra
n
ch 'rl/sh
o
w-empty-prefix'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Hamano
Merg
e
branch
'pw/git-p
4
'
commit
|
commitdiff
|
tree
2012-04-23
Junio C Haman
o
M
e
rge b
r
anch 'ms/remote
-
u
sa
g
e-s
t
ring'
commit
|
commitdiff
|
tree
2012-04-23
Juni
o
C Hamano
M
e
rge bra
n
ch
'jk/rebase-i-submod
u
le-c
o
nflict-only'
commit
|
commitdiff
|
tree
2012-04-20
Junio C Ha
m
a
n
o
RelNotes: th
e
t
h
i
r
d batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-20
Junio C Hamano
Merge branch
'js/
s
pawn-via-
s
hell-pat
h
-fix'
commit
|
commitdiff
|
tree
2012-04-20
Junio C
H
a
mano
Merg
e
branch '
c
t
/
adv
i
se-
p
ush-defau
l
t
'
commit
|
commitdiff
|
tree
2012-04-20
Junio C
H
am
a
no
Merg
e
branch
'
bw/
s
ubmodule-s
e
d-solari
s
'
commit
|
commitdiff
|
tree
2012-04-20
Juni
o
C Haman
o
Merge branch 'jk/ru
n
-comma
n
d
-
e
a
cces'
commit
|
commitdiff
|
tree
2012-04-20
Junio C Hamano
M
e
rge
branc
h
'
j
c/p
u
sh
-
upstream-
s
anity'
commit
|
commitdiff
|
tree
2012-04-20
Junio C Hamano
Mer
g
e branch 'jc/am-report-3way
'
commit
|
commitdiff
|
tree
2012-04-20
Junio C Hamano
Merge branch 'jb/am-i
n
cl
u
de'
commit
|
commitdiff
|
tree
2012-04-20
Junio C Hamano
Me
r
ge b
r
anch 'jc/fmt-merge-msg-p
e
ople'
commit
|
commitdiff
|
tree
2012-04-19
Junio C Hamano
t9400:
f
ix
g
nuism i
n
grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Ramsay Jones
g
i
t-sh-se
t
up
.
sh: Add an pwd() function for
M
inGW
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Ramsay Jones
g
i
t-submod
u
le
.
s
h: Don't use $pat
h
va
r
ia
b
le in eval_
g
e
t
text
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Ramsay J
o
n
es
com
p
a
t/mingw
.
h: Set S_ISUID to preve
n
t a fast
-
import
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-17
Ju
n
io C
Ha
m
ano
mergesort: re
n
a
m
e
it to
llist_merg
e
s
ort()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-17
Johannes Sixt
Do not use SHELL_PA
T
H fr
o
m build syst
e
m in prepare_shell_cmd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
RelNotes: t
h
e second batch of t
o
p
i
cs graduated t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
J
un
i
o C Hamano
Merg
e
branch 'jk/add-p-skip-co
n
f
l
ict
s
'
commit
|
commitdiff
|
tree
2012-04-16
Junio
C
Hamano
Merge bran
c
h '
j
c/
c
ommit-unedit
e
d-te
m
plate'
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-16
Junio
C
Ham
a
no
Me
r
ge b
r
anch 'bw/spawn-via-shell-path'
commit
|
commitdiff
|
tree
2012-04-16
Junio
C Hamano
Merge branch 'wk/gitwe
b
-snapsh
o
t-use-i
f
-
modi
f
ied
-
since'
commit
|
commitdiff
|
tree
2012-04-16
Juni
o
C Hamano
Merge bra
n
ch 'jk/htt
p
-
b
ackend
-
keep
-
co
m
mitt
e
r-ident
.
.
.
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Merge branch
'
sl/autoconf'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hama
n
o
Merge
b
ranch
'j
k
/branch-q
u
i
et
'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
M
er
g
e
b
r
anch 'rs/combine-di
f
f-zero-context-at-th
e
-beginning'
commit
|
commitdiff
|
tree
2012-04-16
Juni
o
C H
a
man
o
M
erge br
a
nch 'jk/diff
-
no-r
e
name-e
m
pty'
commit
|
commitdiff
|
tree
2012-04-16
J
unio C Haman
o
Merg
e
branch '
j
c/ma
i
n
t
-
cl
e
a
n-nested-wo
r
ktree-in-
s
ub
d
ir'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Haman
o
Merge branch 'rs/
u
n
p
ack-trees-leakfix'
commit
|
commitdiff
|
tree
2012-04-16
Junio C
H
a
m
ano
M
erg
e
bran
c
h 'nl/rebase-
i
-
c
he
a
t-
s
heet'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Rel
N
otes:
t
he fi
r
s
t
batch
of topics
graduated to
'ma
s
ter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-16
Jun
i
o
C
H
amano
Merge br
a
nch 'da/difftool-test'
commit
|
commitdiff
|
tree
2012-04-16
Junio C
H
amano
Me
r
ge br
a
nch
'zj/test-cred
-
helpe
r
-nicer-p
r
ove
'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hama
n
o
Mer
g
e branc
h
'jh/not
e
s-merge-
i
n-git-dir-
w
orktree'
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-16
Ju
n
io C
H
am
a
no
Merg
e
b
r
anch 'tr/maint-
w
o
r
d-d
i
ff-regex-
s
ticky'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hama
n
o
M
e
rge bran
c
h
'
jn/diffstat-t
e
sts'
commit
|
commitdiff
|
tree
2012-04-16
Junio C Hamano
Merge bran
c
h 'jc/diff-al
g
o-cleanup'
commit
|
commitdiff
|
tree
2012-04-16
Ju
n
io C Hamano
Merge branch
'
jc/comm
i
t-hoo
k
-authors
h
ip'
commit
|
commitdiff
|
tree
2012-04-16
Junio
C
Hamano
M
e
rge branch 'n
d
/s
t
ream-more'
By Nguyễn Thái Ngọc Duy (6) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-16
Cleme
n
s
Buchach
e
r
m
erge overwrites unstaged changes in r
e
named file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-15
Z
bigniew Jędrzejewsk
.
.
.
i18
n
: mar
k
@{upstream} error messages for translatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-15
Zbign
i
ew Ję
d
r
z
ejewsk
.
.
.
Be mo
r
e
specific if up
s
tream b
r
anch
i
s n
o
t
t
racked
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-15
Zbigniew
Jędrze
j
ewsk
.
.
.
Pro
v
id
e
b
e
t
ter
mes
s
age for bar
n
hc_wiht_tpyo@{
u
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-15
Zbigniew Jęd
r
z
e
jews
k
.
.
.
Provide branch name in
e
rror
m
essa
g
e when usi
n
g @{u}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-15
Z
bi
g
niew
Jędrzeje
w
sk
.
.
.
t
1507: add
t
e
sts to document
@
{upstre
a
m
}
behavio
u
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-15
J
on
a
than Nieder
f
ast-import doc
:
cat-
b
lob
and ls responses n
e
ed to
.
.
.
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-14
J
e
ns L
e
hm
a
nn
submodules: recursive fetch also c
h
ecks
new
t
ags for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-14
J
o
nathan
N
ieder
test: am of empty patch should not succeed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-14
Jonathan Nied
e
r
test: use
t
est
_
i18ncmp
f
o
r "Patch
f
ormat detection
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-14
Jonathan Nied
e
r
test: do
n
ot rely on US
En
g
li
s
h tracki
n
g-
i
nfo m
e
s
sages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-12
Christopher T
i
wald
Fix
h
ttpd tests tha
t
b
r
oke w
h
e
n
non-ff push
a
dvice
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Junio C Hamano
a
pply: document buffer
o
w
n
e
rship rules across functi
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Junio
C
Hamano
apply: tighte
n
constness of line buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Junio
C Ham
a
no
apply: drop unused macro
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Michał Kie
d
rowicz
gitweb:
Refinemen
t
highlightning in
c
o
mbined diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
M
i
c
hał Kied
r
owicz
gitweb: Hi
g
hligh
t
interesti
n
g parts of diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Micha
ł
Kiedrowicz
gitweb: Push formatting diff lines to print_diff_chunk()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Michał Kiedrowicz
g
i
t
w
eb: Use print_d
i
ff_chu
n
k
() for both si
d
e-by-side
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Michał
Kiedro
w
icz
gitweb: Ext
r
act print_sidebyside_diff_lines()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Jakub Narę
b
ski
gitweb: Pass esc_html_hl
_
regi
o
n
s(
)
options to es
c
_html(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
M
ichał
K
iedrowi
c
z
git
w
e
b
: esc_html_hl_
r
e
gions(
)
: Don't create empty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Michał Kiedrowicz
gitweb: U
s
e descrip
t
ive
names in
esc_html_hl_region
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
J
unio
C Hama
n
o
bl
a
me: accept --nee
d
-min
i
mal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Ju
n
i
o
C Hamano
Kick off post 1
.
7
.
10 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Se
b
astian P
i
pping
gitweb: Fix
u
n
i
nte
n
d
e
d "--no-merges" for regular Atom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Stefa
n
o Lattar
i
ni
tes
t
s:
mo
d
er
n
ise styl
e
: more
uses of t
e
st_line_count
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
René
Scharfe
rev
i
sion: insert unsorted, then sort in prepare_r
e
vision_walk
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
René
Scharfe
c
o
m
m
i
t: use merg
e
sort() in co
m
mit_list
_
sort_by_date
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Re
n
é Scharfe
add mergeso
r
t(
)
for linked
l
ists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Re
n
é Scha
r
f
e
unp
a
ck-tr
e
es: plug minor memor
y
le
a
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
René Sc
h
a
r
fe
unpack-trees: don
'
t perform a
n
y index operation if
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Mic
h
a
e
l
H
aggerty
do_for_each_ref(): only iter
a
te o
v
er
t
he subtree that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Michael H
a
ggerty
refs: store refe
r
ences hi
e
r
archically
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Mi
c
hael Hag
g
erty
sort_ref_dir():
simplify logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
M
i
chael H
a
ggerty
re
f
s
.
c: rename r
e
f_array -> ref_dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Michael Haggerty
str
u
ct r
e
f_entry:
nest the valu
e
p
art in a
union
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Michael Haggerty
chec
k
_r
e
f
n
ame_componen
t
(): r
e
tur
n
0 for zero-length
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Michael
Haggert
y
f
ree_ref_en
t
ry(): new func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next