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
J
unio C
H
amano
Merge branch
'
pw/p4-submit
-
co
n
f
l
icts'
commit
|
commitdiff
|
tree
2012-09-18
Junio C Hamano
Merge
b
r
anch 'mv/ch
e
rry-pick-s'
commit
|
commitdiff
|
tree
2012-09-18
Junio C Hamano
M
e
r
ge branch 'nd/fetch-s
t
at
u
s-align
m
e
nt'
commit
|
commitdiff
|
tree
2012-09-18
J
unio
C
Hamano
Sync w
i
th
1
.
7
.
12
.
1
commit
|
commitdiff
|
tree
2012-09-18
Junio C Hamano
Git
1
.
7
.
1
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-18
Junio C Hamano
Merge bran
c
h 'er/doc-
f
a
s
t-import-don
e
'
into m
a
int
commit
|
commitdiff
|
tree
2012-09-18
Junio C Ha
m
ano
Merge branch
'
jk/config-warn-on-inaccessible-
p
a
th
s
.
.
.
commit
|
commitdiff
|
tree
2012-09-18
Philip Oakley
Doc: I
m
pro
v
e shallow depth word
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-18
Andreas Schwab
Docume
n
tatio
n
/git-filter-branc
h
: Move note about effect
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Junio
C
H
amano
The seventh batch for 1
.
8
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Jun
i
o C Hamano
Me
r
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2012-09-17
Junio
C
H
a
mano
Merge
branc
h
'mh/fetch-filte
r
-refs'
commit
|
commitdiff
|
tree
2012-09-17
Junio
C
Hamano
M
erge branch 'nd
/
maint-d
i
ffstat-summary'
commit
|
commitdiff
|
tree
2012-09-17
Junio C Hamano
Merge branch 'jk/config-warn-on-inaccessible-p
a
t
hs'
commit
|
commitdiff
|
tree
2012-09-17
J
unio C Ha
m
ano
Merg
e
branch 'jw/doc-comm
i
t
-tit
l
e'
commit
|
commitdiff
|
tree
2012-09-17
J
unio C Hamano
M
erg
e
branch 'mh/string-list'
commit
|
commitdiff
|
tree
2012-09-17
Junio
C H
a
m
ano
Me
r
g
e
bran
c
h
'j
c
/maint
-
blame
-
no-such-path'
commit
|
commitdiff
|
tree
2012-09-17
Ra
m
k
uma
r
Ramachandra
t
/
perf:
add "tra
s
h d
i
rector
y
"
t
o
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Adam Sp
i
e
r
s
Add missing
-z to git check
-
a
tt
r
usage text f
o
r
c
onsiste
n
cy
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Mischa POSLAWSKY
git-jump
:
i
g
n
ore (custo
m
) pre
f
ix in
diff mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
W
e
sley J
.
Landaker
Documentation
:
indent
-
wi
t
h
-no
n
-tab u
s
e
s "equivalen
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Yac
i
n
e
Belkadi
completion:
a
dd --no-edit
to
g
it-commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyc
k
off
gi
t
-p4: add sub
m
i
t --conflict option and confi
g
v
a
rai
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
P
ete Wyckoff
g
it
p
4
: add su
b
mit
-
-
prepare-p4
-
o
n
ly
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete W
y
ckoff
git
p4
:
add submit --dry-run option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete W
y
ckoff
g
i
t
p4: accept
-
v
f
or --verb
o
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete
W
y
ckoff
git p4: revert del
e
t
ed files after submit
c
an
c
el
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete
Wyck
o
f
f
git p4: rearrange
s
ubm
i
t
te
m
p
l
ate construction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
P
ete Wyckof
f
git
p
4
: test clean-u
p
after failed submit, fix added
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyck
o
ff
gi
t
p4: standardize submit cance
l
d
u
e to
u
nchang
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckoff
git
p
4
: move
confli
c
t p
r
o
m
pt
into run, add [q]uit input
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Pe
t
e
Wy
c
k
off
g
i
t p
4
: remove submit fa
i
l
ure
o
ption
s
[a]pply and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
P
ete Wyckoff
git p4: gracefully fail if
s
o
m
e com
m
its could not be
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-17
Pete Wyckoff
git p4
tes
t
: rem
o
ve bas
h
-ism of c
o
mbined e
x
por
t
/as
s
i
g
nment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-16
Ramsay Jones
te
s
t
-
strin
g
-list
.
c: Fix some s
p
arse warnin
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
Draft rel
e
ase notes t
o
1
.
8
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-15
Ju
n
io C Hamano
Me
r
ge bran
c
h 'jc/
l
l
-merge-binary-ours'
commit
|
commitdiff
|
tree
2012-09-15
Junio
C
Hamano
M
erge branch
'cn/branch-se
t
-upstream-to
'
commit
|
commitdiff
|
tree
2012-09-15
J
u
n
i
o
C Ha
m
ano
Merge branch 'sl/a
u
toc
o
nf'
commit
|
commitdiff
|
tree
2012-09-15
Junio
C
Hamano
Merge branch 'dg/run-co
m
mand-
c
h
i
l
d-c
l
e
anup
'
commit
|
commitdiff
|
tree
2012-09-15
Jun
i
o
C
Ham
a
n
o
Me
r
ge branch 'jc/ma
i
linfo-RE'
commit
|
commitdiff
|
tree
2012-09-15
J
u
nio C
Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2012-09-15
J
unio C
Ha
m
ano
Draft re
l
ease
n
ot
e
s to 1
.
7
.
12
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-15
J
u
ni
o
C Ham
a
no
M
e
rge br
a
n
ch 'sb/send
-
em
a
il-reconfirm-fix' into m
a
int
commit
|
commitdiff
|
tree
2012-09-15
J
unio C Hamano
Merge branch 'jc/
s
end-email-reconfirm' into maint
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hama
n
o
Merge branch 'mz/cherry
-
pick-c
m
dline-
o
rder' into main
t
commit
|
commitdiff
|
tree
2012-09-15
J
u
nio C H
a
mano
S
ync
w
i
t
h 1
.
7
.
11
.
7
commit
|
commitdiff
|
tree
2012-09-15
Juni
o
C Haman
o
Git
1
.
7
.
1
1
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-15
Junio C
H
amano
Merge branch 'jk/maint-quiet-is-synonym-to-s-in-l
o
g
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
Junio
C Haman
o
Merge
branch 'jc/maint-ident-mis
s
ing-human-name' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
Merge branch 'rj
/
te
s
t-regex' into
maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-15
J
unio C Hamano
Merge branch 'da/git
k
-reload
-
t
ag-c
o
ntents'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-15
Junio C Hamano
Merge b
r
anch 'jc
/
ma
i
nt-checkout-fil
e
glob-doc'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-09-14
N
guyễn Thá
i
Ngọc
Duy
fetch:
a
lign per-
r
ef summ
a
ry report in UTF-8 locales
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-14
J
u
n
i
o C
Hama
n
o
T
h
e
s
i
x
t
h
batch for 1
.
8
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-14
Junio C H
a
mano
Merge
b
r
anch
'nd/checkou
t
-option-p
a
rsing-fix'
commit
|
commitdiff
|
tree
2012-09-14
Juni
o
C H
a
m
a
no
Merge b
r
anch '
m
h/abspa
t
h
'
commit
|
commitdiff
|
tree
2012-09-14
Junio C Hamano
Merge branch 'dj/fetch
-
all-tags'
commit
|
commitdiff
|
tree
2012-09-14
Ju
n
io C
Hamano
Mer
g
e
b
ranch
'
sn/
l
s-remote-g
e
t-url-d
o
c
'
commit
|
commitdiff
|
tree
2012-09-14
J
unio C Hamano
M
e
rge branch 'nd/i18
n
-status'
commit
|
commitdiff
|
tree
2012-09-14
Jun
i
o C Hama
n
o
Merge branc
h
'rj/path-c
l
e
anup
'
commit
|
commitdiff
|
tree
2012-09-14
Junio C
H
a
ma
n
o
M
erge
b
ran
c
h 'rj/t
a
p-fi
x
'
commit
|
commitdiff
|
tree
2012-09-14
Miklos Vajn
a
c
herry-
p
i
c
k:
d
o
n't
f
org
e
t -s on f
a
ilure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-14
N
guyễn
T
hái N
g
ọc Duy
Revert dif
f
s
t
at back to
English
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-14
Junio C
H
amano
a
ttr: failure to open
a
.
gitattrib
u
tes file is
OK with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-14
Jeremy W
h
ite
Documentation
:
d
e
scribe subje
c
t mor
e
p
r
ecisely
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Junio C
H
a
mano
Merge git://githu
b
.
com/git-l10n/
g
it-
p
o
commit
|
commitdiff
|
tree
2012-09-12
Ju
n
i
o C Hamano
Start merging the sixth batch for
1
.
8
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Ju
n
io C
H
amano
M
erge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hamano
Merge branch '
j
c
/
m
aint-checko
u
t-filegl
o
b
-
d
o
c'
commit
|
commitdiff
|
tree
2012-09-12
Jun
i
o C Ha
m
ano
Merg
e
branch 'sb
/
send-email-recon
f
i
r
m-fix'
commit
|
commitdiff
|
tree
2012-09-12
Ju
n
io C Haman
o
Merge branch
'nd/
m
aint-re
m
o
t
e-rem
o
v
e
'
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hamano
Merge branch 'nd/log
-
n
-
d
oc'
commit
|
commitdiff
|
tree
2012-09-12
Junio
C
Hamano
M
e
r
g
e branch 'kd
/
cvsimport-av
o
i
d
-invalid
-
tag'
commit
|
commitdiff
|
tree
2012-09-12
Junio C
H
a
mano
Merge b
r
anch '
j
s/compat-itimer
'
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hama
n
o
Merge branch 'js/
c
ompat-mkd
i
r'
commit
|
commitdiff
|
tree
2012-09-12
Junio C Haman
o
F
urther mergin
g
in preparation for
1
.
7
.
1
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Junio C
H
a
m
ano
Merge branch
'm
a
int-1
.
7
.
11
'
i
n
to maint
commit
|
commitdiff
|
tree
2012-09-12
Junio C
H
amano
Merge br
a
n
ch 'jc/apply-binary-p0' into maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-09-12
Junio C Hamano
Me
r
ge branch 'jc/dotd
o
t-is-p
a
rent-directory'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Ju
n
io C Hamano
Merge branch '
j
c/maint-d
o
c-c
h
eckout-b-always-takes
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Jun
i
o
C
H
amano
M
e
r
g
e br
a
n
c
h 'jk/maint-http-h
a
lf-auth-p
u
sh'
i
nto
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
J
u
nio
C
Hamano
M
e
rge b
r
anch
'
kk/maint-for-each-ref-multi-sort' int
o
.
.
.
commit
|
commitdiff
|
tree
2012-09-12
Mi
c
h
ael Haggert
y
f
e
t
ch-pack:
e
liminat
e
spurious error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Michael Hagg
e
rty
cmd_fetch_
p
ac
k
(): simplify com
p
u
t
ation of r
e
tu
r
n
value
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Mic
h
ael
H
a
g
g
erty
fet
c
h-
p
ack:
r
ep
o
rt missing re
f
s even if no
e
xisting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Michael Haggerty
cmd_fetch_pack():
r
et
u
rn earl
y
if finish_connect()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
M
ichael Haggerty
fil
t
e
r
_
r
efs(): simplify logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Mich
a
e
l H
a
ggerty
fil
t
er
_
refs
(
):
b
uild refs
list
as we
go
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Michae
l
Haggerty
fil
t
er_refs(): de
l
ete matched
r
e
fs from
s
oug
h
t l
i
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Mic
h
ael H
a
ggert
y
fetch_pa
c
k(): update
s
ought
-
>nr to refl
e
ct
number of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Micha
e
l
H
agge
r
t
y
filter_refs(): do not chec
k
the same soug
h
t_pos tw
i
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Michael H
a
gg
e
rt
y
Change fetch_pack() and fr
i
ends to
t
ake string_list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Michael Ha
g
gerty
fetch_
p
ack(): rei
n
dent func
t
ion decl and defn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Michael H
a
ggerty
Rename static
fun
c
ti
o
n fetch_pack() to http_fe
t
ch_pack()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Michae
l
Hag
g
erty
t5500:
add
te
s
ts
of
f
et
c
h-pack --al
l
--de
p
th=N $URL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Mic
h
a
e
l Hagg
e
rty
t5500: add t
e
sts of error output for
m
i
s
sing refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
M
i
c
hael Hagger
t
y
api-string-list
.
tx
t
: in
i
tiali
z
e th
e
string_list the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Michael Haggerty
string_list: a
d
d
a
f
unction string_
l
is
t
_longes
t
_pref
i
x()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-09-12
Mic
h
a
el H
a
ggerty
s
t
ring_list
:
add
a new fun
c
tio
n
, string_list_r
e
move_d
u
pl
i
c
ates()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next