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/cherry-pick-root-with-resolve' into maint
2011-05-26
Juni
o
C Hamano
Merge branch 'jk/cherry
-
pick-root-with-res
o
lve'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Ha
m
ano
M
e
rge branch 'rg/copy-geco
s
-username' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
er
g
e
b
r
an
c
h 'fc/
c
ompletio
n
-
z
sh
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
M
e
rge branch 'jk
/
git-conn
e
cti
o
n
-
deadlo
c
k-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
branch 'js/ma
i
nt-send-
p
ack-stateless-r
p
c-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hamano
M
e
rge branch '
s
vn-fe-mai
n
t' of
g
it://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hamano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
M
erge b
r
anc
h
'js/mai
n
t-1
.
6
.
6
-s
e
nd-p
a
ck-
s
tatel
e
s
s
-
rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
Haman
o
U
pdate draft relea
s
e
no
t
e
s
to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C Hamano
Merge bra
n
c
h 'j
n
/maint-fo
r
mat-patch-doc'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Me
r
ge
branch 's
s
/
c
herry-pick-x-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Mer
g
e branch
'
vr/m
e
rge
-
base-d
o
c
' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
M
er
g
e
b
ranc
h
's
r
/main
t
-fast-imp
o
rt-tighten
-
optio
n
-
p
arsi
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/t
1
506-shell-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ham
a
n
o
Me
r
ge bra
n
ch 'jc/f
i
x-
a
dd-u-unmerged' into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
M
e
rg
e
branch 'jn/gitweb-
d
ep
e
nde
n
cy' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
J
uni
o
C
H
amano
M
e
rge branch 'jc/maint
-
b
ranch-merge
o
pt
i
ons' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Me
r
g
e branch 'jc/maint-add-p-o
v
er
l
ap
p
ing-
h
un
k
s
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Ha
m
ano
sideband_
d
emu
x
():
fix
decl-a
f
ter-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Up
d
a
t
e dr
a
ft re
l
e
ase note
s
to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Merge branch 'c
n
/
format-pat
c
h-quiet'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
M
erge branc
h
'
j
m
/merget
o
ol-subm
o
d
ules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Merg
e
bran
c
h 'jk
/
format-patch-quote-
s
pecial-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Merge branch
'
vh/g
i
t-sv
n
-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Haman
o
git_open_noatime(): drop
u
nused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
s
ha1_f
i
l
e
: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ham
a
no
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hama
n
o
Merge
branch
'aw
/
main
t
-reb
a
se-i-p-no-ff' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
M
erge branch 'js/blame-pars
e
na
m
e' into
main
t
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C Hamano
Merge bran
c
h 'gr/c
v
simpor
t
-alternative-cv
s
pass-l
o
cati
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branc
h
'cj/p
4
merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
M
e
rge branc
h
'
jk/merge-one-
f
ile-working-tre
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
M
erge
b
r
anch 'jc/fix
-
diff-
f
il
e
s-unm
e
rged'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
ni
o
C Ham
a
no
Merge branch 'mz/
m
a
i
nt-
r
ename-un
m
erged
'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
H
amano
t1507: avoid
"${parameter<op>'word'}" i
n
side d
o
uble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C H
a
mano
t3
7
0
1
: add-p-fix make
s
the
l
ast test to p
a
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Ha
m
a
no
m
e
rge:
m
a
ke br
a
nch
.
<name>
.
mergeoptions
c
orrectly
over
r
ide
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Merge
b
ran
c
h 'js/ma
i
n
t
-
1
.
6
.
6
-
send-pa
c
k-statel
e
ss-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Junio
C
Ha
m
ano
t3701: fix here do
c
ument
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 Hamano
M
e
rge
branch 'jh/dirst
a
t
' into
m
a
in
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Ham
a
no
Merge branc
h
'
s
p
/m
a
int-clea
r
-postfields'
into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Me
r
ge
bran
c
h
'jk
/
m
a
int-stash-
o
ob' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io
C
H
a
m
a
no
Merge bran
c
h 'jk/maint-upl
o
ad-pack-
s
hall
o
w' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hamano
M
erge b
r
anch 'dm
/
stash-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch 'jc
/
pack-obje
c
t
s
-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge
bra
n
c
h
'mg/re
f
log-with-optio
n
s' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge bran
c
h 'jk/stash-loo
s
en-safety' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o
C Hamano
Merge branch 'ar/cl
e
an-rmdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
ma
n
o
Merge
b
r
a
n
ch '
m
g
/sha1-path-advise' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
"add
-p": work-around an old laziness
th
a
t does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hamano
add--in
t
e
ra
c
tive
.
p
erl
:
factor
ou
t
repeat
e
d
-
-rec
o
unt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Ha
m
ano
t
3
70
1
:
Editing a split hunk in an "ad
d
-p" ses
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
ano
a
dd -p: '
q
' should re
a
lly qui
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hamano
Start 1
.
7
.
5
.
1 mainte
n
a
nce track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Ha
m
a
n
o
Merge branch 'mg/x-years-1
2
-mon
t
hs' into maint
commit
|
commitdiff
|
tree
2011-04-26
Junio C Haman
o
http:
cle
a
r
P
OSTFI
E
LDS when initializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Juni
o
C
H
am
a
no
M
erge branch 'j
s
/maint-
1
.
6
.
6-
s
end-pack-s
t
ateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fix "
a
dd -u" that so
m
eti
m
es fails to resolve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
a
no
diff-fi
l
es: sho
w
unme
r
ge
d
entries co
r
rectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
H
a
m
ano
dif
f
: remove often unused parameters f
r
om diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hamano
d
i
f
f
.
c: return
f
ile
p
air
from diff
_
unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hama
n
o
t
est: use $_z40 from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Ham
a
no
Git 1
.
7
.
5-rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
unio C Hamano
Sync with
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hama
n
o
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
u
n
io C Hamano
Revert "run-command: prettify
-
D_FORTIFY_SOURCE workaroun
d
"
commit
|
commitdiff
|
tree
2011-04-14
Junio
C
Hamano
M
e
r
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o
C Hamano
Git 1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ham
a
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io C Hamano
Merg
e
branch 'jc
/
rev-
l
i
s
t-options-f
i
x' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge bran
c
h 'js/checkout-untracked-s
y
mli
n
k' into maint
commit
|
commitdiff
|
tree
2011-04-12
Juni
o
C H
a
m
a
n
o
M
e
rge b
r
anch 'js/c
h
eckout
-
unt
r
acked
-
symlink'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
M
erge branc
h
'nd/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-11
Jun
i
o C Ham
a
n
o
M
erge
git://git
.
bogomips
.
o
r
g/git-
s
v
n
commit
|
commitdiff
|
tree
2011-04-11
Junio C Haman
o
M
e
rge git://git
.
kernel
.
org/pub/s
c
m/git
k
/gitk
commit
|
commitdiff
|
tree
2011-04-06
Junio
C Ham
a
no
G
it 1
.
7
.
5-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Hamano
S
y
n
c
with
1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
J
u
n
io
C
Haman
o
Git 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
u
ni
o
C Hamano
Mer
g
e bran
c
h
'
nm/
m
ai
n
t-conflicted-submod
u
le-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge bra
n
ch
'mg/rev-li
s
t-n
-
re
v
erse-doc' into maint
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge branc
h
'j
k
/maint-
r
emote-mirror
-
safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio C H
a
mano
M
e
rge
bra
n
ch 'mg/doc-revi
s
ions-txt
'
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Ha
m
ano
T
each core
.
bigfilethreash
o
ld to
p
a
c
k-objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C
Ham
a
no
Mer
g
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
J
unio C Hamano
Merge branch '
j
l/submodul
e
-
fe
t
ch-o
n
-demand'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Haman
o
Merge branch 'jc/re
v
-list-opti
o
ns-fix'
commit
|
commitdiff
|
tree
2011-04-04
Junio
C
Hamano
M
e
r
ge branch
'
nm
/
maint-conf
l
icted-submodul
e
-e
n
tries
'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
erge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C Hamano
Start preparin
g
for 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Hamano
Merge branc
h
'jc/inde
x
-update-if-able
'
into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merg
e
bran
c
h 'lt/default-abbrev' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hamano
Mer
g
e br
a
nch
'
j
c/maint-rev-list-cul
l
e
d
-bou
n
dar
y
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch 'mm/maint-l
o
g-n-with-diff-filt
e
ring' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
i
o
C
Haman
o
Merge
b
ranch
'
jk/format-patch-multiline
-
heade
r
' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
u
n
i
o
C Hamano
Merg
e
branch
'j
n
/maint-in
s
taweb-plack-fix' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ham
a
no
Merge branch 'l
p
/config-vername-c
h
eck'
into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C
Hamano
Up
d
ate release no
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
mano
Sync with
1
.
7
.
4
.
3
commit
|
commitdiff
|
tree
next