repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/daemon-test-race-fix' into maint
2012-05-07
Junio C Hamano
Merg
e
br
a
nch 'js/daem
o
n-test
-
race-fix' into m
a
int
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C
Hamano
Merge branch 'jk/maint-config-bo
g
us-sect
i
on' into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Haman
o
Merge branch 'pw/t5800-import-ra
c
e-fix'
i
n
to maint
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Hamano
Merge branch 'rt/che
r
ry-revert-conflict-s
u
mmary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
io C Hama
n
o
M
e
r
ge bran
c
h '
c
b/main
t
-re
p
ort-
m
o
u
nt-point-co
r
rectly
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C
Hamano
Merge b
r
anch
'
jc/merge-reduce-pa
r
ents-e
a
r
l
y' into
maint
By
Junio C Hamano
(4) and MichaĆ Kiedrowicz (1)
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio
C Ha
m
ano
Merge
bra
n
ch 'cb/cherry-
p
i
ck-rev-p
a
t
h
-con
f
usion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
amano
M
e
r
g
e
b
r
a
nch 'cb/
h
ttp-multi-curl-auth
'
into maint
commit
|
commitdiff
|
tree
2012-05-03
Jun
i
o C
Hamano
Mer
g
e branch 'mb/fe
t
ch-call-a-non-bra
n
ch-a-re
f
' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Ha
m
ano
Mer
g
e branch 'rl/
m
aint-st
a
s
h
-
i
18n-save-error' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C
H
a
man
o
M
erge br
a
nch 'jm/
m
aint-s
t
rncpy-di
f
f
-
no-index'
i
n
to
.
.
.
By Jim Meyering (1) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Git 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
a
mano
Merge
branch 'pw/fast-i
m
port-dataref
-
parsing' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Merge branc
h
'it/fetc
h
-
p
ack-many-refs' into mai
n
t
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Merge br
a
nch 'jl/m
a
i
n
t
-
s
ubmod
u
le-recurs
e
-fet
c
h' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
Merge branch 'jc/main
t
-blame-minimal' into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
Merge branch 'lp/maint-diff-three-dash-with-grap
h
'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge
branch
'jk/rebase-i
-
sub
m
odu
l
e-co
n
flict
-
only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
a
mano
Merge branch 'maint' of htt
p
s://github
.
co
m
/g
i
t
-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
H
amano
Start pr
e
par
i
n
g
for
1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C Hama
n
o
Merge
branch 'jk/run-command-eacces' in
t
o m
a
int
commit
|
commitdiff
|
tree
2012-04-26
Junio C Haman
o
Merge branch 'jc/
p
ush-upstream-sanity' into maint
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hamano
Merge b
r
anch 'jc/ma
i
nt-clean-nested-worktree-in-subdir
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge branch 'jk
/
d
i
ff-
n
o-rename-e
m
pty'
i
nto maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge branch
'rs/c
o
mbine-diff-zero-c
o
ntext-at-th
e
-begin
n
ing
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C Hamano
Merge b
r
an
c
h 'jc/commit-une
d
ited-
t
emplate' into ma
i
nt
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge branch 'jk/add-p-skip-c
o
nflicts' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Ham
a
no
Merge branch 'jc/com
m
it-hoo
k
-authorship' into ma
i
nt
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C
Ham
a
no
Merge
branch 'tr/maint
-
wo
r
d-diff-regex-s
t
i
c
k
y' into
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hama
n
o
Me
r
ge branch
'
jh/notes-merge
-
in-git-di
r
-worktr
e
e' i
n
to
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Hamano
Syn
c
wi
t
h
1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C Ha
m
ano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C
Hamano
Sync w
i
th 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
Git 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o C Haman
o
diff
--no-index: use st
r
buf for
tempo
r
ary
pathnames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-19
Ju
n
io C Hamano
fmt-merge-msg: discar
d
needless merge par
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio C Hama
n
o
b
u
ilti
n
/
m
erge
.
c: reduce paren
t
s early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
Junio C Ham
a
no
builtin/
m
e
rge
.
c
: co
l
lect oth
e
r par
e
nts early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-18
J
unio
C
Haman
o
builtin/merge
.
c: r
e
move "remoteheads" glob
a
l variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Junio C Hamano
blame: accept --need-min
i
mal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Ju
n
io C Hamano
Merg
e
bran
c
h
'main
t
-1
.
7
.
9' into maint
commit
|
commitdiff
|
tree
2012-04-10
Junio C
Hamano
Merge branch 'mai
n
t-1
.
7
.
8
'
in
t
o
m
aint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-09
J
unio
C Hamano
Me
r
ge
branch
'
jc/maint-v
e
ri
f
y
-
objects-
r
e
m
ove-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'dw/g
i
twe
b
-d
o
c-grammo
'
i
nto maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Ha
m
ano
Merge
b
r
anch 't
r
/c
a
che-tree' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
amano
M
erge branch 'cb/mai
n
t
-t5541-make-server-port-port
a
ble
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ha
m
ano
M
e
rge br
a
nch 'cn/maint-r
e
v
-list-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ham
a
no
Merge branch 'tr
/
maint
-
b
undl
e
-boundary' into m
a
in
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'tr/ma
i
nt
-
bundle-long
-
subje
c
t' into m
a
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C Ham
a
no
Mer
g
e br
a
nch 'ph/
r
e
rere-doc' into maint
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
J
uni
o
C
H
a
mano
Git 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Junio C Hamano
p
u
sh: error out when th
e
"upstream"
s
emantics does
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
J
unio C Haman
o
Documentation/git
-
commit
:
rephrase the "initial-ness
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
Junio C H
a
mano
G
i
t 1
.
7
.
10-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio
C
H
a
ma
n
o
Merge branch
'
p
t/gitk'
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Sy
n
c w
i
t
h
1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
Jun
i
o
C Haman
o
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Ju
n
io C Hamano
M
e
r
ge branch 'jc/
m
a
i
nt-merge-autoedit' into maint
commit
|
commitdiff
|
tree
2012-04-02
Ju
n
io C
Ha
m
ano
M
erge git://
g
i
t
h
u
b
.
com/git-l10n/
g
it-po
commit
|
commitdiff
|
tree
2012-03-31
Jun
i
o C H
a
mano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2012-03-30
Jun
i
o C Haman
o
commit: rephrase th
e
e
rror when use
r
did
not to
u
ch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
J
unio C Hama
n
o
c
ommi
t
: do
n
ot trigger bo
g
us
"
h
as templated
me
s
s
age
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Junio C Ha
m
a
n
o
t75
0
1:
test the r
i
g
h
t k
i
nd of break
a
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Junio C Hamano
Git 1
.
7
.
10-rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
Ju
n
io C Hamano
l1
0
n upd
a
t
e
s for Git
1
.
7
.
10-r
c
1
commit
|
commitdiff
|
tree
2012-03-26
Junio
C Hamano
Update d
r
aft re
l
ease notes
t
o
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Sync
w
ith
1
.
7
.
9
.
5
commit
|
commitdiff
|
tree
2012-03-26
J
u
ni
o
C
H
a
mano
Git
1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
Ham
a
no
M
er
g
e
b
r
anch 'jn/maint-fast-
i
mport-empty-ls' in
t
o
maint
commit
|
commitdiff
|
tree
2012-03-26
Juni
o
C H
a
mano
Merge bra
n
ch 'ph/rerere-doc' into m
a
int
commit
|
commitdiff
|
tree
2012-03-26
J
u
n
i
o C Haman
o
Merge
b
ranch
'
ms/maint-config-error-
a
t-eol-linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-24
Junio C Hama
n
o
Merge gitk changes fro
m
Paul Mackerras a
t
git://ozlab
s
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
Junio
C Hamano
Git 1
.
7
.
1
0
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
J
u
n
i
o C Hamano
.
mailmap: unify v
a
rious
ol
d
mail addresses of
g
i
t
ster
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
J
u
nio C Hamano
M
erge branc
h
'am/c
o
m
p
letion-zsh-fix'
commit
|
commitdiff
|
tree
2012-03-23
Jun
i
o C Hamano
Me
r
g
e
branch
'
dw/gitweb-
d
oc
-
g
r
ammo'
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merg
e
bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C H
a
ma
n
o
Merge branch
'maint-
1
.
7
.
8'
into maint
commit
|
commitdiff
|
tree
2012-03-20
J
unio C Hama
n
o
merge: back
p
ort GI
T
_MERGE_A
U
TOEDIT s
u
pport
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio
C Hamano
Merge branch 'ks/
s
ort-
w
ildcard-in-mak
e
file' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Hamano
M
erg
e
branch 'jc/advise-i18n
'
i
n
to main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C Ha
m
a
n
o
M
er
g
e branch 'jn/gitweb-un
s
pecified-acti
o
n' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Juni
o
C Hamano
Merge branch 'ab
/
p
erl
-
i18n'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Ha
m
a
no
Upd
a
t
e draft
rele
a
s
e
note
s
to 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Junio C
Hamano
Merge branch 'th/m
e
rgetools-d
e
ltawalke
r
'
commit
|
commitdiff
|
tree
2012-03-16
Jun
i
o C Haman
o
M
erge branch 'jc/maint-veri
f
y-obj
e
cts-remove-pessimi
s
m
'
commit
|
commitdiff
|
tree
2012-03-16
Jun
i
o C
H
amano
Merge branch 'sl/custom
i
ze-sane-tool-pat
h
'
commit
|
commitdiff
|
tree
2012-03-16
Ju
n
io C Hamano
M
e
rge "t
w
o fixes
for fast-import's
'
ls
'
c
o
mm
a
nd" fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Juni
o
C Ha
m
ano
Merge branc
h
'th/git-d
i
ffall'
commit
|
commitdiff
|
tree
2012-03-16
Juni
o
C Hamano
Merge branch 'th/doc-diff-sub
m
odul
e
-option'
commit
|
commitdiff
|
tree
2012-03-15
Juni
o
C
Hamano
fetch/receive: remove over-pessi
m
istic connectivit
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Junio C Ha
m
ano
clean:
p
reser
v
e nested git worktree
i
n
sub
d
irectories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Junio C
Ha
m
a
no
re
m
ove_dir
_
recursivel
y
(): Add flag for skippi
n
g
r
emova
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
J
u
n
io
C
Hamano
Git 1
.
7
.
10-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Junio C Ha
m
ano
M
e
rge
b
r
anch 'jc/i1
8
n-shell-script-ge
t
text'
commit
|
commitdiff
|
tree
2012-03-13
J
unio C
Ha
m
ano
M
e
rge branch 'jc/maint-undef
i
n
ed-i18n-obse
r
vation-test'
commit
|
commitdiff
|
tree
2012-03-13
Juni
o
C Hamano
M
erg
e
b
ranc
h
'
m
s/maint
-
c
o
nfig-error-at-eol
-
l
i
n
ecount'
commit
|
commitdiff
|
tree
2012-03-13
J
unio C Hamano
Mer
g
e branch 'ph
/
rerere-doc'
commit
|
commitdiff
|
tree
next