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 'jk/maint-config-bogus-section' into maint
2012-05-07
Junio C Ha
m
an
o
Merge branch
'
jk/maint-config-bogus-
s
ectio
n
'
i
nto maint
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Ham
a
n
o
M
erge
br
a
nch 'pw/t5800-im
p
ort-
r
ace-
f
ix' into maint
commit
|
commitdiff
|
tree
2012-05-07
J
u
nio C Ha
m
ano
Merge branch 'rt/cherry
-
r
evert-
c
onflict-su
m
mary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C
Haman
o
M
erge branc
h
'cb/main
t
-repo
r
t-mount-point-correctly
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C Hama
n
o
Merge branch
'
jc/merge-reduce-parents-early' into
m
aint
By
Junio C Hamano
(4) and MichaĆ Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Merge bra
n
ch 'cb/cher
r
y-pic
k
-rev-path-confusion' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Hamano
Merge
br
a
nch 'cb/h
t
tp-multi-curl-a
u
th' in
t
o
maint
commit
|
commitdiff
|
tree
2012-05-03
Junio C Ha
m
ano
Merge branch
'
mb/fetch-ca
l
l-
a
-
n
o
n-branch-a-ref' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
unio
C Hamano
M
erge
branch
'rl/maint-stash-i18n-s
a
ve-error' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Ham
a
no
Mer
g
e branch 'jm/maint-strncpy-diff
-
no-i
n
dex' into
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Ha
m
a
n
o
Git 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
J
unio C
H
a
m
ano
Merge branch 'pw/fa
s
t-import-dataref
-
parsin
g
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Me
r
ge branc
h
'it/fetch
-
pack-man
y
-refs' into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge branch 'jl/
m
aint-s
u
bmod
u
le-recu
r
se
-
fetch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge
b
ranch 'jc/ma
i
nt-blame-mini
m
al' into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Merge branch 'lp/m
a
int-diff-thr
e
e-da
s
h-with-gra
p
h'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch
'jk/rebase-i-submodule-conflict-onl
y
'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Haman
o
Merge branc
h
'maint
'
of https://github
.
co
m
/
g
i
t
-l10
n
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hamano
S
t
art preparing f
o
r 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge branch '
j
k/run-co
m
mand
-
ea
c
c
e
s' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merg
e
bra
n
ch 'jc/push-upst
r
eam-
s
anity' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Hamano
M
e
rge b
r
anch 'jc/maint-clean
-
n
e
sted-wo
r
ktree-in-sub
d
ir
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Ha
m
ano
M
e
rge bra
n
ch 'jk/diff-no
-
rename-empty' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
a
m
ano
Mer
g
e branch
'
r
s
/combine-diff-ze
r
o-context-at-the-beginning
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
M
e
r
ge branch
'
jc/commit-unedited-template'
i
nto ma
i
nt
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o
C Haman
o
M
e
rg
e
branc
h
'jk/a
d
d-p-skip-conflicts' i
n
to
m
a
i
n
t
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
Merge
b
ranch 'jc/comm
i
t-h
o
ok-aut
h
ors
h
i
p
' into ma
i
nt
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io
C
Ha
m
ano
Merge bran
c
h 'tr/maint-word-diff-r
e
gex-
s
tic
k
y' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
io C Haman
o
Me
r
ge
br
a
nch 'jh/n
o
tes-merg
e
-
in-g
i
t
-
dir-worktree
'
int
o
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Sync with 1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C Hamano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
mano
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Sync wi
t
h 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
aman
o
Git
1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Hamano
diff --no-index: use
s
t
r
buf fo
r
temporary
p
athnames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-19
Juni
o
C Hamano
fmt-m
e
rge-msg: discard needless merge p
a
r
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio
C
Haman
o
builtin/merge
.
c: reduce p
a
rents
early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
J
unio C Ham
a
no
bui
l
tin/merge
.
c
:
collect
o
ther
p
arents ea
r
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio C
H
amano
builtin
/
merge
.
c:
remo
v
e "
r
emotehead
s
"
g
lobal variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Junio C Hamano
bl
a
me: accept --need-mini
m
al
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Ju
n
io
C
Ham
a
no
Mer
g
e
b
r
anch 'maint-1
.
7
.
9' into m
a
int
commit
|
commitdiff
|
tree
2012-04-10
Jun
i
o C Haman
o
Merge branch 'maint-1
.
7
.
8
' into mai
n
t-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
amano
M
erge
b
r
anch 'jc/maint
-
ve
r
ify-objects-remove-pess
i
m
i
sm
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ham
a
n
o
Merge bra
n
ch 'dw/gitweb-d
o
c-grammo' into maint-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o C Hamano
Merge branch 'tr/cache-tree'
i
nto mai
n
t-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hamano
Mer
g
e branch 'cb/maint-t5541-make-ser
v
er-port-portable
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ha
m
ano
Merge
branch 'cn/main
t
-
r
ev-list-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C Haman
o
Merge b
r
anch 'tr/maint-bundle-boundary' int
o
m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C
H
a
m
ano
M
e
rg
e
branc
h
'tr/maint-bu
n
d
le-long-subject' in
t
o
m
a
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Hamano
M
erge branch 'ph/rerere-doc'
int
o
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
Junio C Hamano
Git 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Junio C Ham
a
no
pus
h
: er
r
or out when
the "ups
t
ream" semantics does
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
J
u
n
io C Ha
m
ano
Documentat
i
on/git-commit: r
e
p
h
rase the "initia
l
-
n
ess
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
J
u
nio C Hamano
Git
1
.
7
.
1
0-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Merge
b
ranch '
p
t/gi
t
k'
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Sync wit
h
1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
Junio
C Hamano
Gi
t
1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Juni
o
C Hamano
M
e
rge
branch 'jc/ma
i
nt-me
r
ge
-
autoedit' into maint
commit
|
commitdiff
|
tree
2012-04-02
J
u
nio C Ham
a
no
Merge g
i
t:
/
/gith
u
b
.
com/git-l1
0
n/git-
p
o
commit
|
commitdiff
|
tree
2012-03-31
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-03-30
J
unio C Hamano
c
o
m
mit
:
rephrase th
e
error wh
e
n user did no
t
touch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Junio C
H
aman
o
comm
i
t
:
do not trig
g
er bogus "
h
a
s
templated message
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Junio C Ham
a
no
t7501: test
t
he right kind of breakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Juni
o
C Hamano
Git
1
.
7
.
10-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
J
u
n
io C H
a
mano
l10n up
d
ates
f
o
r
G
i
t
1
.
7
.
10-rc1
commit
|
commitdiff
|
tree
2012-03-26
J
unio C Hamano
U
pdate
draft release
n
otes
t
o
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C Hamano
Sync w
i
th 1
.
7
.
9
.
5
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ha
m
a
no
Git
1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C H
a
mano
M
erge
bran
c
h
'jn/
m
aint-
f
ast
-
import-empt
y
-ls' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-26
Jun
i
o C Hamano
Merge branch 'ph/rerere-doc' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ha
m
a
no
M
e
rge br
a
nch '
m
s
/
maint-config-error-at-e
o
l-linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-24
Junio C Hamano
M
erge gitk changes
f
rom Pa
u
l Macker
r
as at g
i
t:/
/
ozlabs
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
Junio
C
Hamano
Git 1
.
7
.
10-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
.
ma
i
lmap: unify v
a
rio
u
s old
m
ail add
r
esses of
g
i
t
ster
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
Merge branch '
a
m/completion-zsh-
f
i
x'
commit
|
commitdiff
|
tree
2012-03-23
Junio
C Haman
o
Merg
e
bran
c
h 'dw/
g
itweb-doc-grammo'
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hama
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hama
n
o
Merge branc
h
'maint-1
.
7
.
8
'
in
t
o
maint
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio
C Ham
a
no
merge: backpor
t
GIT_MERGE_AUTOED
I
T support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge
b
ranch 'ks/sort-
w
ildcard-in-makefile' into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branch 'jc/advise
-
i18n' into mai
n
t
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C Ham
a
no
Merge branch 'jn/gitwe
b
-uns
p
ecified-actio
n
'
int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hama
n
o
M
e
rg
e
branch
'ab/perl-i18n'
commit
|
commitdiff
|
tree
2012-03-16
Junio
C
H
a
ma
n
o
Update dr
a
f
t
release n
o
tes t
o
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Junio C
H
am
a
no
Merge
branch 't
h
/
m
e
r
g
etool
s
-de
l
t
a
wa
l
ker'
commit
|
commitdiff
|
tree
2012-03-16
Junio C
Hamano
Mer
g
e br
a
nch 'jc/maint-ve
r
ify-objects-remov
e
-
pessimism'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hama
n
o
Merge branch 'sl/customi
z
e
-
s
ane-tool-path'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
M
e
rge "two fixes
f
or fast
-
i
m
port's 'ls' comm
a
nd" from
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
J
unio C H
a
m
a
no
M
erge
b
ranc
h
'th/git-diffall'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge branch
'
th/doc-di
f
f-su
b
module-
o
p
t
ion'
commit
|
commitdiff
|
tree
2012-03-15
Junio C
H
aman
o
fetch/
r
eceive: remove over-pessi
m
istic con
n
e
c
tivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Jun
i
o C Hamano
clean: prese
r
ve nest
e
d git wo
r
ktree in su
b
directo
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
J
unio C
Haman
o
remove_dir_recursively
(
): Add flag
f
or
skipping
r
emoval
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
J
u
nio C Ham
a
no
Git 1
.
7
.
10-rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Junio C H
a
m
a
no
Merg
e
branch 'jc/
i
18n-shell-scr
i
pt-
g
ettext'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Ha
m
a
n
o
Merge branch 'jc/m
a
int-undefined-i18
n
-
ob
s
erv
a
tion-test
'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hama
n
o
Merge
branch '
m
s/maint-config-er
r
or-a
t
-eol-line
c
ount'
commit
|
commitdiff
|
tree
2012-03-13
Juni
o
C
Hamano
Merge b
r
a
n
ch
'
ph/rerere-
d
o
c
'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hamano
a
m
: of
f
icially deprecate
-
b/--binary opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next