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
Sync with 1.7.12.1
2012-09-10
Junio
C
H
amano
S
tar
t
p
r
eparing for 1
.
7
.
12
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Juni
o
C Haman
o
Merge br
a
nch 'bc/prune-info' int
o
maint
commit
|
commitdiff
|
tree
2012-09-10
Ju
n
io C H
a
mano
Merge branch 'mai
n
t
-
1
.
7
.
11' into maint
commit
|
commitdiff
|
tree
2012-09-10
Junio C
Hamano
Alm
o
s
t
1
.
7
.
1
1
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
M
erge branch 'mg/r
e
bas
e
-i-onto-reflog-in
-
full' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
u
n
io C Hamano
Merge branch 'jc/maint-protec
t
-sh-from-ifs' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Merge branch 'bc
/
re
c
e
ive-pack-s
t
dout-prot
e
c
tion' into
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
Mer
g
e bran
c
h
'
j
k/main
t
-null-in-tr
e
es' into maint-1
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
u
nio C
H
amano
M
e
rge branch 'tr/maint-send
-
email-2047' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
J
uni
o
C Hamano
Merge br
a
nch
'mm/di
e
-
w
ith-dash
d
ash-hel
p
'
in
t
o ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
M
e
rge branch 'js
/
gitw
e
b-path-
i
nfo-
u
nq
u
ot
e
'
i
nt
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-09-10
Junio C
Hamano
gitcli: contrast wildc
a
rd given
to sh
e
ll and to g
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-10
Junio C Hamano
git
c
li: formatting fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
J
u
nio C Hamano
mailinfo: strip "
R
E:
"
p
r
efix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
Ju
n
i
o C Ham
a
no
attr: "binary" attribute should choose built-in "binary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-09
J
u
ni
o
C Hamano
merge: teach
-Xours/
-
X
theirs to binary
l
l
-
merge dr
i
v
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-07
Junio C Hamano
The f
o
urth batch for 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-07
Junio C Haman
o
Merge branch 'nd/b
r
anch
-
v
-align
m
e
n
t'
commit
|
commitdiff
|
tree
2012-09-07
Junio
C Ham
a
no
Me
r
ge branch 'jk/maint-http-half-
a
u
t
h-pus
h
'
commit
|
commitdiff
|
tree
2012-09-07
Juni
o
C Hamano
M
erge branch 'jc/m
a
int-doc-chec
k
out-b-always-takes
.
.
.
commit
|
commitdiff
|
tree
2012-09-07
Ju
n
io C
H
amano
Merge
b
ran
c
h 'jc/app
l
y-binary-p0'
commit
|
commitdiff
|
tree
2012-09-07
Ju
n
i
o
C
Hamano
M
e
rge branc
h
'jc/
d
otdot-is-parent-directory'
commit
|
commitdiff
|
tree
2012-09-07
Juni
o
C Ham
a
no
Merge branch 'nd/i18n-pa
r
seopt-h
e
lp'
commit
|
commitdiff
|
tree
2012-09-07
Junio C Hamano
M
e
rge
bran
c
h
'nd
/
a
m-i18n-fix'
commit
|
commitdiff
|
tree
2012-09-07
Ju
n
io C Hamano
M
erge branch
'jk
/
config-warn-on-inaccessible-p
a
ths'
commit
|
commitdiff
|
tree
2012-09-07
Junio C Hamano
M
erge branch 'k
k
/
m
ain
t
-for-each-re
f
-mul
t
i-so
r
t'
commit
|
commitdiff
|
tree
2012-09-07
Junio C Ham
a
no
Merge bran
c
h 'lt/commi
t
-tr
e
e
-
g
uess-utf-8'
commit
|
commitdiff
|
tree
2012-09-07
J
unio C H
a
mano
Merge branc
h
'pw
/
p
4-use-client-sp
e
c
-bran
c
h-
d
et
e
c
t
ion'
commit
|
commitdiff
|
tree
2012-09-07
Junio C
H
amano
Merge branch 'tr/maint-
p
arseopt-avo
i
d-empty'
commit
|
commitdiff
|
tree
2012-09-07
Junio C Haman
o
Merge branch 'nd
/
i18n-poiso
n
-test
-
updat
e
s'
commit
|
commitdiff
|
tree
2012-09-04
J
unio C Hamano
Document file-glob for "git
c
he
c
kout --
'
*
.
c'"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-03
Junio C Haman
o
Update
mailm
a
p
fo
r
a handful of f
o
lks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-03
Junio C
Ha
m
ano
The third batch
f
or 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-09-03
Junio C Ha
m
ano
Merge
b
ranch 'js
/
use-s
c
-o
p
en-max'
commit
|
commitdiff
|
tree
2012-09-03
Junio C Hamano
Me
r
ge branc
h
'js/compat-mkdir
'
commit
|
commitdiff
|
tree
2012-09-03
J
unio C
Hama
n
o
Merge branch 'js/n
o
-curl-easy-strerror-on-old-curl
'
commit
|
commitdiff
|
tree
2012-09-03
Juni
o
C
H
ama
n
o
Merge
b
ranch '
j
c/maint-mer
g
etoo
l
-style-
f
ix'
commit
|
commitdiff
|
tree
2012-09-03
Junio C Hamano
Merge bra
n
c
h
'
sz/sub
m
o
dule-for
c
e-update'
commit
|
commitdiff
|
tree
2012-09-03
Junio C Ha
m
ano
Merge branch '
p
h/st
a
s
h
-rerere'
commit
|
commitdiff
|
tree
2012-09-03
Junio C
Hama
n
o
Merge br
a
n
ch 'jc/daemon-acces
s
-hook'
commit
|
commitdiff
|
tree
2012-09-03
J
u
nio C Hamano
Merge b
r
anch
'jc/send-em
a
i
l
-
r
econfi
r
m
'
commit
|
commitdiff
|
tree
2012-09-03
Junio C Hamano
Merge
b
r
a
nch 'cw/c
h
erry-pick-
a
llow-
e
m
pty-message'
commit
|
commitdiff
|
tree
2012-09-03
Junio C Ham
a
n
o
Merge
b
ranch
'jc/mai
n
t-sane-exec
v
p-notdir'
commit
|
commitdiff
|
tree
2012-09-03
Junio
C Ham
a
no
Merge branch 'jc/maint-c
o
nfig-exit-sta
t
u
s
'
commit
|
commitdiff
|
tree
2012-08-31
Junio C Hamano
sp
l
it_i
d
ent_li
n
e():
make b
e
st effort when
parsin
g
a
u
t
hor
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Junio C Hamano
reduce_heads(): reim
p
lem
e
nt on top of
remove_redund
a
n
t()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Jun
i
o C H
a
m
a
n
o
merge-bas
e
: "--is-ancestor A
B
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Junio C Hamano
g
et_merge_ba
s
es_m
a
ny(): walk from many tips in
p
arall
e
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Junio
C
H
amano
in_merge_bases():
u
se paint_down_to_com
m
on()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-31
Junio
C Hamano
merge_bases_many(): split out the logic to paint histo
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-29
Junio
C Hamano
Latter half of the se
c
ond batch for
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-29
Junio C Haman
o
M
e
rge branch
'rr/pre
c
ompose
-
u
t
f8-cleanup'
commit
|
commitdiff
|
tree
2012-08-29
Junio C
H
am
a
no
Merge branch 'mh/maint
-
conf
i
g-doc-p
r
oxy-command'
commit
|
commitdiff
|
tree
2012-08-29
J
u
nio C Hamano
Mer
g
e
b
ranch
'
ef
/
w
in32-cred-helper'
commit
|
commitdiff
|
tree
2012-08-29
Junio C Hamano
Merge branch
'
hv/submodule-path-u
n
mat
c
h'
commit
|
commitdiff
|
tree
2012-08-29
Junio C Hamano
Mer
g
e
bra
n
ch 'jc/
c
a
p
abilities'
commit
|
commitdiff
|
tree
2012-08-29
Junio C Hamano
Merge branch 'mg/reb
a
se-i-onto-reflog-in-f
u
ll'
commit
|
commitdiff
|
tree
2012-08-29
Junio C Hamano
Merge branch 'mz
/
empty-re
b
ase-tes
t
'
commit
|
commitdiff
|
tree
2012-08-29
J
u
nio C Hamano
Merg
e
bra
n
ch
'
jc/main
t
-protect
-
sh
-
f
r
om-if
s
'
commit
|
commitdiff
|
tree
2012-08-29
Junio
C Hamano
Merge
b
ranch
'
bc/prun
e
-
i
n
fo'
commit
|
commitdiff
|
tree
2012-08-29
Junio C Hamano
Merge bra
n
ch 'mz/che
r
ry-code-cleanup'
commit
|
commitdiff
|
tree
2012-08-28
Junio C Hamano
http-p
u
sh
:
use in_merge_ba
s
e
s()
for fast-forward check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-28
Junio C Hamano
r
ece
i
ve-pack: use in_merge
_
b
a
ses() for fast-forward
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-28
Junio
C
Hamano
i
n_mer
g
e_
b
as
e
s(): sup
p
ort only
o
n
e "othe
r
"
commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-27
Junio C
H
a
mano
First
h
alf
of t
h
e second b
a
tch for
1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-27
Jun
i
o C Ha
m
a
n
o
Mer
g
e
branc
h
'jk/docs
-
docbook-mo
n
o
sp
a
c
e-disp
l
ay'
commit
|
commitdiff
|
tree
2012-08-27
Juni
o
C
Haman
o
Merge bran
c
h 'da/difftool
-
updates'
commit
|
commitdiff
|
tree
2012-08-27
Junio C
H
amano
Merge branch
'
js/
g
rep-p
a
ttern
t
ype-
c
o
nfig'
commit
|
commitdiff
|
tree
2012-08-27
Junio C
H
a
man
o
Merge branc
h
'bc/re
c
e
ive-pack-stdout
-
pro
t
ection'
commit
|
commitdiff
|
tree
2012-08-27
Junio C Ham
a
n
o
M
erg
e
b
r
a
n
ch '
a
b/diff-write-incomplete-line'
commit
|
commitdiff
|
tree
2012-08-27
Junio
C Hamano
M
e
rge b
r
anch 'jc
/
main
t
-t
7
406-rev-parse-m
a
x
-
count
-
hu
h
'
commit
|
commitdiff
|
tree
2012-08-27
Junio C H
a
mano
Merg
e
branch 'jk/maint
-
null-in-trees'
commit
|
commitdiff
|
tree
2012-08-27
Juni
o
C Hamano
Merge branch 'mm
/
push-default-switc
h
-war
n
ing'
commit
|
commitdiff
|
tree
2012-08-26
Junio C Hama
n
o
doc: "git
c
he
c
kout -b/-B/--orphan"
a
lways takes a
b
ranch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-25
Junio C Hamano
apply: compute patch->def_name
c
or
r
e
c
tly
u
nde
r
-
p
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-24
Junio C Hamano
Mer
g
e branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2012-08-24
Junio C Hamano
M
erge
b
ranch '
m
aint-1
.
7
.
1
1' into maint
commit
|
commitdiff
|
tree
2012-08-24
J
unio C Ha
m
ano
P
repare for 1
.
7
.
11
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-24
J
u
nio
C Hamano
Merge
b
ranch 'm
v
/pull-
r
-for-reb
a
se' into
maint-1
.
7
.
1
1
commit
|
commitdiff
|
tree
2012-08-24
J
unio C Hamano
Merge branc
h
'jc/ma
i
n
t
-abbre
v
-option-
c
li' into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Junio C Hamano
Merge branch 'jc/maint-rev-li
s
t-
t
o
p
o-doc' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Junio C Ha
m
a
n
o
Merge b
r
anch
'
h
v/coding-guidelines' into
maint-
1
.
7
.
11
commit
|
commitdiff
|
tree
2012-08-24
Junio
C
Hamano
Merge branch
'
jc/tag-do
c
' into maint-1
.
7
.
1
1
commit
|
commitdiff
|
tree
2012-08-24
Junio C
H
am
a
no
M
erge
b
r
anch 'mk/test-seq' into maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-08-24
J
u
nio C Hamano
Mer
g
e branch 'lp/n
o
-cmd-http-fe
t
c
h
'
i
n
t
o maint-1
.
7
.
11
commit
|
commitdiff
|
tree
2012-08-24
J
unio C
Hamano
M
e
r
ge branch 'bw/ma
i
nt
-
1
.
7
.
9-solaris
-
ge
t
pas
s
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-08-24
Junio
C
Hamano
M
e
rge
bran
c
h 'jk/maint-commit-check-committer-early
.
.
.
commit
|
commitdiff
|
tree
2012-08-23
J
un
i
o C
H
amano
specifying
r
anges: we did not
mean to make "
.
.
" an
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-22
Junio
C
H
a
mano
Kick of
f
cycle towards 1
.
8
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-08-22
Junio
C
H
a
mano
Merge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2012-08-22
Junio C Hamano
Me
r
g
e
b
ranch 'jc/doc-
g
it-u
p
dates'
commit
|
commitdiff
|
tree
2012-08-22
J
u
nio
C
Hamano
Merge b
r
anch 'mv/pull-r-for-rebase'
commit
|
commitdiff
|
tree
2012-08-22
Junio C H
a
mano
Merge b
r
anch
'jc/maint
-
abbrev-option-c
l
i'
commit
|
commitdiff
|
tree
2012-08-22
Jun
i
o C
H
amano
Merg
e
branch
'
jc/m
a
in
t
-rev-
l
i
s
t-topo-doc'
commit
|
commitdiff
|
tree
2012-08-22
Junio C H
a
mano
Me
r
ge br
a
nch
'
hv/c
o
ding-guidelines
'
commit
|
commitdiff
|
tree
2012-08-22
Ju
n
i
o
C H
a
mano
M
e
rge branch 'j
k
/check-docs
-
upd
a
te'
commit
|
commitdiff
|
tree
2012-08-22
Junio
C
Hama
n
o
Me
r
ge bran
c
h
'j
c
/tag-doc
'
commit
|
commitdiff
|
tree
2012-08-22
Juni
o
C
Hamano
Merge branch 'js
/
gi
t
w
eb-
p
ath-info
-
un
q
uote'
commit
|
commitdiff
|
tree
2012-08-22
J
unio
C Hama
n
o
Merge branc
h
'tr/void-diff-s
e
tup-done
'
commit
|
commitdiff
|
tree
2012-08-22
Junio C Hamano
Merge branch
'
tr/m
e
rge-recursive-fl
u
sh
'
commit
|
commitdiff
|
tree
next