repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'pw/p4-submit-conflicts'
2012-09-18
Juni
o
C Hamano
Me
r
ge br
a
nch 'pw/p4-submit-conflicts'
commit
|
commitdiff
|
tree
2012-09-18
Juni
o
C Hamano
M
e
rge branch 'm
v
/
c
herry-pick-s'
commit
|
commitdiff
|
tree
2012-09-18
J
unio C Hamano
Merge branch 'nd/fetch-status-align
m
en
t
'
commit
|
commitdiff
|
tree
2012-09-18
Junio C Hamano
Sync
w
i
th 1
.
7
.
1
2
.
1
commit
|
commitdiff
|
tree
2012-09-18
Junio
C
Hama
n
o
Git 1
.
7
.
1
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-18
J
unio C Hamano
Merge branch 'er/
d
oc-fast-import-done' int
o
maint
commit
|
commitdiff
|
tree
2012-09-18
Junio C
H
amano
Merge b
r
a
nch 'jk/
c
onfi
g
-warn-on-
i
n
a
c
cess
i
ble-paths
.
.
.
commit
|
commitdiff
|
tree
2012-09-18
Philip Oakley
Doc: Impr
o
v
e shallow dept
h
wor
d
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-18
A
n
dreas Schwab
Documentatio
n
/
git-f
i
lt
e
r-branch: Move note about effect
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Jun
i
o C Hamano
The seventh ba
t
ch for 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Junio C Hama
n
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2012-09-17
Junio C Ham
a
no
Merge b
r
anc
h
'mh/fetch-filter-ref
s
'
commit
|
commitdiff
|
tree
2012-09-17
Junio C Hamano
Merge
branch 'nd/maint-diff
s
ta
t
-s
u
mmary
'
commit
|
commitdiff
|
tree
2012-09-17
Junio C
Ha
m
ano
Merge branch 'jk/config-warn-on-inacc
e
ssi
b
le-paths'
commit
|
commitdiff
|
tree
2012-09-17
J
uni
o
C Hamano
Me
r
ge branch 'jw/doc
-
comm
i
t-t
i
tle'
commit
|
commitdiff
|
tree
2012-09-17
Junio C Hamano
Merg
e
branch
'
m
h/
s
tring-list
'
commit
|
commitdiff
|
tree
2012-09-17
Junio C Ha
m
ano
M
e
rge bra
n
c
h
'jc/maint-b
l
ame-no-such-path'
commit
|
commitdiff
|
tree
2012-09-17
R
amkum
a
r Ra
m
achan
d
r
a
t
/
p
er
f
: ad
d
"trash
directory"
t
o
.
gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Adam
S
piers
A
dd missing -z to git check-att
r
usage
t
ext for
c
o
n
s
istency
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Mischa POSLAWSKY
git-jum
p
: igno
r
e
(c
u
s
t
o
m) prefix in diff mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Wesle
y
J
.
L
a
ndaker
D
o
cum
e
ntation: i
n
dent-wi
t
h-non-tab uses
"equivalent
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Yacine Belkadi
completion: ad
d
--no-
e
dit to git-comm
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckof
f
git
-
p4: add
s
u
bmit --conflict o
p
tion and config var
a
i
abl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckoff
git
p4: ad
d
submit --prepare-p4-only
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Pe
t
e Wyckoff
git p4: add sub
m
it --dry-run option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Pete
W
yck
o
ff
git
p4: accept -v for --verb
o
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Pe
t
e
Wyckoff
g
i
t
p4:
r
e
v
e
rt
d
elet
e
d
file
s
aft
e
r submit canc
e
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wycko
f
f
git p4: rearrange submi
t
templa
t
e
constru
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Pet
e
Wyckoff
g
i
t
p
4: test clean-up
a
fter
fail
e
d su
b
m
i
t,
fix added
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckoff
git p4: standardize su
b
m
it canc
e
l due to
u
nc
h
anged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Pete
Wycko
f
f
git p
4
:
m
o
v
e co
n
flict prompt into run, add [q
]
ui
t
input
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Pete
W
y
ckoff
git p4: re
m
ove submit failur
e
opt
i
ons [a]pply and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Pe
t
e
W
yckoff
git
p
4: gracefully fail
i
f
s
o
me
co
m
mits could not be
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-17
Pete
W
y
ckoff
g
i
t p4
test: re
m
ove
b
a
sh-ism of
c
ombined expo
r
t
/assignment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-16
Ramsay
J
on
e
s
test-s
t
rin
g
-
l
ist
.
c
: Fix some spa
r
se w
a
rnings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-15
Junio C Ham
a
no
Dra
f
t re
l
ease notes to
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-15
Junio C Haman
o
M
erge branch '
j
c/ll-merge-bin
a
ry-ours'
commit
|
commitdiff
|
tree
2012-09-15
Junio C
Hamano
Merge br
a
nch 'cn/bra
n
c
h
-se
t
-upstream-to'
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
Mer
g
e branch 'sl
/
autoconf'
commit
|
commitdiff
|
tree
2012-09-15
Junio C
H
a
man
o
Merge b
r
anch 'dg
/
run-command-ch
i
ld-
c
leanu
p
'
commit
|
commitdiff
|
tree
2012-09-15
Junio C Haman
o
Merge br
a
nch 'j
c
/mailinfo-RE
'
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
Draft release notes to 1
.
7
.
12
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-15
Junio
C Ha
m
a
no
Merge
br
a
nch 'sb/send
-
email-r
e
c
o
nfirm-fix'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-09-15
Junio
C
H
amano
Merge bran
c
h
'
jc/send-email-reconfirm' into
m
ain
t
commit
|
commitdiff
|
tree
2012-09-15
J
unio C Hamano
Merge branc
h
'mz/cherry-pick-cmdline-order' int
o
maint
commit
|
commitdiff
|
tree
2012-09-15
Junio C Ha
m
ano
Syn
c
wi
t
h
1
.
7
.
11
.
7
commit
|
commitdiff
|
tree
2012-09-15
Ju
n
io C Hamano
Git 1
.
7
.
11
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-15
J
uni
o
C Ha
m
ano
Merge branch 'j
k
/maint
-
quiet
-
is-synonym-t
o
-s-in-log
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
J
u
nio C Hama
n
o
Merge branc
h
'jc/maint-i
d
ent-missi
n
g-human-name'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
Juni
o
C Hamano
Merge branch 'rj
/
tes
t
-regex' in
t
o maint-1
.
7
.
1
1
commit
|
commitdiff
|
tree
2012-09-15
Junio C Ham
a
no
Merge
b
ranch
'da/gitk-relo
a
d-
t
ag-contents' i
n
t
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hama
n
o
Mer
g
e branch 'jc/maint-checko
u
t
-fileglob-doc'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-09-14
Nguyễn Thá
i
Ngọc Duy
fetch: a
l
ign per-re
f
summ
a
ry report in UTF-8 locales
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-14
Jun
i
o C Haman
o
The sixth batch
f
or
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-14
J
unio C Hamano
Merge branch 'nd/checkout-opt
i
on
-
parsing-fix'
commit
|
commitdiff
|
tree
2012-09-14
Ju
n
io C Ha
m
ano
Merge branch 'mh/
a
bspath'
commit
|
commitdiff
|
tree
2012-09-14
Jun
i
o C Ham
a
no
Merge branch 'dj/fet
c
h-all-tags'
commit
|
commitdiff
|
tree
2012-09-14
Junio C Hamano
Merge branc
h
'
sn/ls-remote-get-url-doc'
commit
|
commitdiff
|
tree
2012-09-14
J
u
nio C H
a
mano
Mer
g
e branch 'nd/i18
n
-status'
commit
|
commitdiff
|
tree
2012-09-14
Junio C Hamano
M
erge
b
ranch 'rj/pat
h
-clean
u
p'
commit
|
commitdiff
|
tree
2012-09-14
Junio C Hamano
M
e
r
g
e branch 'rj/tap-fix'
commit
|
commitdiff
|
tree
2012-09-14
Miklos Va
j
na
cherry-pick: do
n
't
fo
r
ge
t
-
s on failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-14
Nguy
ễ
n T
h
ái Ngọc Du
y
Revert
diffstat back to English
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-14
Jun
i
o
C
Hamano
attr: fail
u
re to open a
.
g
i
t
a
ttribu
t
es file
i
s OK
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-14
Je
r
emy White
Documentation:
d
e
scri
b
e su
b
ject mor
e
precisel
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Juni
o
C
H
aman
o
Merge gi
t
:/
/
gi
t
hub
.
com/git
-
l10n/git-po
commit
|
commitdiff
|
tree
2012-09-12
Jun
i
o C Hamano
S
t
art m
e
r
g
ing the
sixth batch for 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Juni
o
C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hamano
Merge
b
ranc
h
'jc/m
a
i
n
t-checkou
t
-fileglob-do
c
'
commit
|
commitdiff
|
tree
2012-09-12
Jun
i
o
C
H
a
m
ano
Me
r
ge branch
'sb
/
send-
e
m
a
il-reconfirm-fix
'
commit
|
commitdiff
|
tree
2012-09-12
Junio C
Hamano
Merge branc
h
'nd
/
maint-remote-remove'
commit
|
commitdiff
|
tree
2012-09-12
Junio C H
a
mano
Merg
e
b
r
anch 'nd/
l
o
g-n-doc'
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hamano
Merge bra
n
ch 'kd/cvsi
m
p
o
rt-avoid-invalid
-
tag'
commit
|
commitdiff
|
tree
2012-09-12
Juni
o
C
H
a
mano
Merge branch 'js/compat-iti
m
er'
commit
|
commitdiff
|
tree
2012-09-12
Junio C Haman
o
Merge branch 'js
/
compat-mkdir'
commit
|
commitdiff
|
tree
2012-09-12
Junio C H
a
man
o
Further merging in prepar
a
tion
f
or 1
.
7
.
12
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Jun
i
o C Hamano
M
erge bra
n
ch 'maint-
1
.
7
.
11
'
into maint
commit
|
commitdiff
|
tree
2012-09-12
Juni
o
C Hamano
Me
r
ge
branch
'
jc
/
apply-binary-p0' into
m
aint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-12
Junio C
H
amano
Merge branch
'jc/do
t
dot-is-parent-
d
i
rectory' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
J
u
n
io C Hama
n
o
M
e
rge branch 'jc
/
maint-doc-checkou
t
-b-always
-
takes
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
J
u
n
i
o C Hamano
Merge branch 'jk/maint-
h
ttp-half-auth-pus
h
' in
t
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hamano
Merge
b
ranch 'k
k
/
m
aint-for
-
ea
c
h-ref-
m
ulti-
s
o
rt' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Michael Haggerty
fet
c
h-p
a
ck: eliminat
e
s
p
urious error mes
s
ages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Michael
H
aggerty
cmd_fetch_pac
k
(): simpl
i
fy computation of re
t
urn val
u
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
M
i
chael Haggerty
fe
t
ch-pack: report missing
refs eve
n
if n
o
existing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Michael Haggerty
cmd
_
fetch_pack():
return early
if finish_c
o
nnect
(
)
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Mich
a
e
l
Hag
g
erty
f
ilte
r
_refs():
simp
l
ify logi
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Mi
c
hae
l
Haggerty
filte
r
_
re
f
s(): build refs list
as we go
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
M
i
chael
H
agg
e
rty
filter_
r
ef
s
(
)
: delete matched
r
efs from sou
g
ht list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
M
i
chael Haggerty
fetch_
p
ack(): update
s
ough
t
->
n
r to re
f
lect number of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Michael Ha
g
gerty
filter_refs(): do
n
ot check
t
he sam
e
sou
g
ht_pos twice
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Micha
e
l Hag
g
er
t
y
C
hange fetch_pack() and frie
n
ds to take s
t
ri
n
g_list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Mi
c
h
ael Hagg
e
rty
fetch_
p
ack()
:
rei
n
dent
f
unction
d
ecl and defn
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Micha
e
l Hag
g
er
t
y
Renam
e
sta
t
ic f
u
nction f
e
tch_
p
ack() t
o
ht
t
p_fetc
h
_
pack()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Michael H
a
ggerty
t5500: add
test
s
o
f
f
etch-pack --all --depth=N $URL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
M
ichael
Haggerty
t55
0
0: add tests of error o
u
tput fo
r
miss
i
n
g
refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Michael Haggerty
ap
i
-string-list
.
txt: in
i
t
i
alize
the string
_
list the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
Michael Haggerty
string_l
i
st:
a
dd a func
t
i
o
n str
i
ng_list_longest_p
r
efix()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-12
M
ich
a
el
Haggerty
string_list
:
add a
n
e
w
function, string_list_
r
e
m
ove_duplicat
e
s()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next