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 'jk/merge-one-file-working-tree' into maint
2011-05-13
Ju
n
io C Hamano
Merge
branch 'jk
/
merge-one-
f
ile-work
i
n
g
-tree' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
r
g
e b
r
anch 'jc/fix-d
i
ff-f
i
les-unmerged' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge branch 'mz/m
a
int-re
n
am
e
-unmerged'
into
ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t370
1
: fi
x
here d
o
cument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
mano
Merge branch '
j
h/dirs
t
at' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
Hamano
Merge branch 'sp/mai
n
t-clear-postfi
e
ld
s
' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
M
e
rge branch 'jk/mai
n
t
-
s
t
a
sh-oob' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge
branch 'jk/maint-uplo
a
d-pac
k
-sha
l
low' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Ham
a
n
o
Me
r
ge b
r
anch '
d
m/stash-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge
branch 'jc/pack-objects-bigfi
l
e' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C
H
amano
Merg
e
branch 'm
g
/refl
o
g-with
-
options
'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
am
a
no
Merge branc
h
'
j
k/
s
t
ash-loosen-safet
y
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C Hama
n
o
Merge bran
c
h
'
ar/clean-rmdir
-
empt
y
' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Me
r
g
e
branch 'mg/sha1-path
-
adv
i
se' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
Start 1
.
7
.
5
.
1 maintena
n
ce trac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C
H
amano
M
e
r
ge branch 'm
g
/x-years-12-month
s
'
in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-04-26
Junio C Ha
m
ano
http:
cl
e
ar POSTFI
E
LDS when initi
a
l
i
z
ing a
slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
mano
diff
-
f
iles: sho
w
u
n
me
r
g
ed
entries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
a
no
dif
f
:
remove ofte
n
unused p
a
rameters fro
m
diff_un
m
er
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
diff
.
c: return filepair from di
f
f_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
test: use $
_
z
4
0
f
r
om test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Ha
m
a
n
o
Git 1
.
7
.
5
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Sy
n
c
with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio C Hamano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
unio C
H
amano
Re
v
ert "run
-
comm
a
nd:
p
rettify -D_FORTIFY_SOURCE workaro
u
n
d
"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
Merge bran
c
h
'
mai
n
t'
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
am
a
no
G
it 1
.
7
.
5
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Me
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-13
J
u
n
io C Hamano
Merge bra
n
ch 'jc/rev
-
list-options-fix
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C
Hamano
Me
r
ge branch
'
j
s/chec
k
o
ut-untr
a
c
ked-symlink' into maint
commit
|
commitdiff
|
tree
2011-04-12
Junio
C
Hamano
M
erge branch 'js/checkout-untracked-s
y
mlink'
commit
|
commitdiff
|
tree
2011-04-12
J
u
ni
o
C Hamano
M
erge
b
ranch
'nd/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
M
erge git://
g
it
.
bogomip
s
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
Merge
g
it://git
.
kernel
.
or
g
/pu
b
/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o
C Hamano
Git 1
.
7
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C Hamano
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
no
Git 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hamano
Merge branch 'nm/maint-conflict
e
d-submo
d
ule
-
e
ntries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Ham
a
no
Mer
g
e branch
'
mg
/
rev-lis
t
-n-
r
everse-doc' into maint
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hamano
Mer
g
e bra
n
ch 'jk/maint-remot
e
-mi
r
ro
r
-safer'
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C
H
amano
Merge b
r
anch 'mg/doc-revisions-t
x
t'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ha
m
ano
Teach c
o
re
.
bigfileth
r
e
asho
l
d
to pack-
o
bject
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Ha
m
ano
Merge br
a
n
ch 'mai
n
t
'
commit
|
commitdiff
|
tree
2011-04-04
Junio C H
a
mano
Merge br
a
nch 'jl/subm
o
dule-fetc
h
-on-demand'
commit
|
commitdiff
|
tree
2011-04-04
J
u
nio C Ha
m
ano
M
erge branch
'jc/rev-list-
o
ptions-fix'
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
io C Hamano
M
e
rge branch '
n
m/ma
i
n
t
-confl
i
c
t
e
d-submodule-entries'
commit
|
commitdiff
|
tree
2011-04-03
J
u
ni
o
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Haman
o
S
tart preparing f
o
r 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C Ha
m
ano
Merg
e
branch 'jc/index-update-if-able' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
mano
Merg
e
branch 'lt/default-a
b
brev' i
n
to maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
man
o
Merg
e
branch 'jc/maint-re
v
-list-culled-boundar
y
' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o C
Hamano
M
erge branch 'mm/maint-log-n-with-diff-filteri
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio
C Hamano
Merge branch 'jk
/
fo
r
mat
-
patch-multiline-heade
r
'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
e
rge bran
c
h 'jn/
m
aint-instaweb-plack-fix' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
erge br
a
nch 'lp/config-vernam
e
-
check' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-04-03
Junio C
Ha
m
ano
Update
r
elease notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Haman
o
Sync with
1
.
7
.
4
.
3
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hamano
Git 1
.
7
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Hamano
Doc: mention --delta-base-offs
e
t
is the default fo
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Mer
g
e branch 'nd/i
n
it-gitdir'
commit
|
commitdiff
|
tree
2011-04-02
J
u
nio C Hamano
Merge br
a
nc
h
'jc/merge-sans-branch
'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge bra
n
ch 'jr/grep
-
en-c
o
nfig'
commit
|
commitdiff
|
tree
2011-04-02
Junio C
H
a
m
ano
Merge branch 'ab/i18n-st'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
M
e
rge
b
ranch 'jk/pull-into-empty'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merg
e
bra
n
ch 's
b
/sparse-more'
commit
|
commitdiff
|
tree
2011-04-02
Ju
n
io C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2011-04-01
J
u
n
i
o C Hamano
Merg
e
branch 'nd/index-
d
o
c
' into maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
M
er
g
e
branch 'pk/stash-ap
p
ly-status-
r
elative' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C Ha
m
ano
M
erge branch
'jc/m
a
int-diff-q-filter' into
maint
commit
|
commitdiff
|
tree
2011-04-01
Jun
i
o C Hamano
Merg
e
branch
'
js/ma
i
nt-stash-i
n
dex-copy' int
o
m
ain
t
commit
|
commitdiff
|
tree
2011-04-01
J
u
nio C Hamano
Merge branch '
m
g
/
doc-bisec
t
-tweak-worktree' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge bran
c
h
'jh/
m
aint-do-not-track-non-br
a
nches' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Jun
i
o C
H
a
mano
Merge
branch 'fk/m
a
int-cvsimp
o
rt-early-failure'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C Ha
m
ano
M
e
rge branch 'jc/maint
-
apply-report-
o
ffse
t
' into maint
commit
|
commitdiff
|
tree
2011-04-01
Jun
i
o
C
Hamano
Me
r
ge branch 'jc/mai
n
t-apply-no-do
u
b
le-patch'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C Ham
a
no
M
e
rg
e
branch 'js/che
c
kout-un
t
racked-sy
m
link' into maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge "
c
hecko
u
t
a
mbi
g
uous ref bugfix" into maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
"log
-
-cherry-p
i
ck" documentation regression
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-31
Junio C Ha
m
ano
G
it 1
.
7
.
5-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-31
Junio C Hamano
Merg
e
bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2011-03-31
Junio C
H
amano
parse-rem
o
te:
typo
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-30
Juni
o
C Hamano
Merg
e
b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2011-03-30
Junio C
Hamano
t8
0
01: check the exit st
a
tus of the
c
ommand b
e
i
ng tested
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-30
Ju
n
io C Hamano
Merg
e
b
r
a
nch 'svn-fe'
o
f
git://repo
.
or
.
cz/git/jrn
commit
|
commitdiff
|
tree
2011-03-29
Junio C Hama
n
o
M
er
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2011-03-29
Junio C Ha
m
ano
M
erge bra
n
c
h
'jc/fetch-pr
o
gress
i
ve-strid
e
'
commit
|
commitdiff
|
tree
2011-03-29
Ju
n
io C Ha
m
a
n
o
Merg
e
branche
s
'sp/main
t
-fet
c
h-pack-s
t
op-early' and
.
.
.
commit
|
commitdiff
|
tree
2011-03-29
Junio
C
Hamano
R
eve
r
t two "n
o
-done"
r
everts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Junio C
Hamano
en
a
b
l
e
"no-done
"
extensio
n
only when serving over smart
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Junio
C H
a
mano
Fix
p
otential local deadlock during fetch-pack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Junio C Ha
m
ano
enable
"
n
o-done" e
x
tension only wh
e
n f
e
tching over
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Junio C
H
amano
Revert
"
fetch-pack: Imple
m
ent no-done cap
a
b
i
lity"
commit
|
commitdiff
|
tree
2011-03-29
Junio C
H
amano
Revert "uploa
d
-pac
k
: Imple
m
ent
no-do
n
e
c
apabi
l
ity"
commit
|
commitdiff
|
tree
2011-03-28
Ju
n
i
o C Hamano
M
e
rge br
a
nch
'
m
aint'
commit
|
commitdiff
|
tree
2011-03-27
Junio C H
a
mano
Update draft
r
elease no
t
e t
o
1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-27
J
u
ni
o
C
Hamano
M
e
rge bra
n
ch 'mg/r
e
v-list-n-pa
r
ents'
commit
|
commitdiff
|
tree
2011-03-27
Junio C Hama
n
o
Merge
b
ranch
'
js/remove-unused-variables'
commit
|
commitdiff
|
tree
2011-03-27
Juni
o
C Hamano
Merge branch
'
jp/completi
o
n-help-a
l
ia
s
'
commit
|
commitdiff
|
tree
next