repo.or.cz
/
git
/
jnareb-git.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-alias-fix' into maint
2011-06-01
Junio C
H
ama
n
o
Merge
branch
'
jk/maint-config-alias-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2011-06-01
Ju
n
io C Hamano
Merg
e
branch 'jc/
f
mt-req-fix' into mai
n
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Me
r
ge branch 'jk/maint-d
o
cs' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C
H
amano
Mer
g
e br
a
nch 'jn/doc-remote-he
l
pers' i
n
to maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge
b
ra
n
ch 'kk/mai
n
t-pref
i
x-in-c
o
n
fig-mak'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-31
J
u
ni
o
C
Hama
n
o
St
a
rt
1
.
7
.
5
.
4 draft
r
elease notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io
C
Hamano
M
e
rge
b
ranch 'tr
/
add-i-no-es
c
ape' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
Hamano
Merge branch 'vh/config-interac
t
ive-singlekey
-
doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o C Hamano
Merg
e
branch
'
ml/test-readme' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
Junio C Haman
o
Merge branch 'ab/
i
18n-fix
u
p' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio
C
H
amano
Merge branch
'jc/ren
a
me-d
e
grade-cc-to-
c
' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-31
J
unio
C Hamano
M
e
rge bra
n
ch 'rr/
d
oc
-
c
ontent-type' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C
H
amano
Merge
b
r
a
n
ch 'jm/maint-misc
-
fix' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o C Hamano
M
erge b
r
anch
'bc/maint-sub
m
odule-fix-pa
r
ked' into maint
commit
|
commitdiff
|
tree
2011-05-30
J
u
ni
o
C Ha
m
ano
Merge
bran
c
h
'
b
c/maint-a
p
i-doc
-
p
a
r
ked' into maint
commit
|
commitdiff
|
tree
2011-05-30
J
u
nio C Hamano
Merg
e
br
a
nch 'jn/run-command
-
error-failure'
into maint
commit
|
commitdiff
|
tree
2011-05-27
Junio
C Hamano
config
.
mak
.
in: allow "configure --s
y
sconfdir=/
e
lse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Gi
t
1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'maint-1
.
7
.
4' into main
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'j
k
/
git-
c
onn
e
ction-deadlock
-
fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
M
e
r
ge branch 'j
s
/main
t
-
s
e
n
d
-pack-stateless-rpc-d
e
a
dlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch '
j
k
/
m
aint-
u
pload-pack-shallow'
i
n
t
o
main
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
b
r
anch 'jm/maint-diff-word
s
-with-sb
e
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merge branch 'kk/maint
-
p
refix-in-confi
g
-mak' into
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'mg/diff-uiconfig-doc' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Haman
o
M
e
r
ge branch 'ft/gitw
e
b-tar-with
-
gzip-n' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio
C Hamano
M
erge
branch 'ss/doc-svn' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Me
r
ge
branch 'jn/format-patc
h
-doc'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Haman
o
Merge branch 'jc
/
m
a
int-pathspec-stdin-
a
n
d-cmd
l
ine'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
br
a
nch 'jk/cherry
-
pick-root-with-
r
esolv
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge
b
ranch 'rg/copy-gecos-
u
sername' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Merge branch 'fc/co
m
pleti
o
n-zs
h
' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hamano
Merge branch 'jk/git-
c
onnecti
o
n-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hama
n
o
Merge br
a
nch 'js/maint-
s
end-p
a
ck-st
a
teless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Ha
m
ano
Merge b
r
anch
'
svn-fe-maint' of git://
r
epo
.
o
r
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
J
unio C Haman
o
u
se
r
format_f
i
nd_requi
r
em
e
nts(): find requirement for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Ju
n
io C Hamano
handl
e
_opt
i
ons(): do not mi
s
count
h
ow many
arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hama
n
o
Merge bran
c
h 'js/mai
n
t-1
.
6
.
6-se
n
d
-
pack-
s
tateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Update draft releas
e
notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge branc
h
'jn/main
t
-
f
ormat-
p
atch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge branch
'
ss/c
h
erry-pick-x-doc' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
M
erge branch 'vr/merge-base-doc'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branc
h
'sr/maint-fast-import-tighte
n
-option-parsi
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/
t
1
5
06-shell-par
a
m-expansion-go
t
cha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
M
erge branch '
j
c/fix-add-
u
-u
n
me
r
ged' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Me
r
g
e bran
c
h 'jn/gitweb-dependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge br
a
nch 'jc/mai
n
t-branch
-
mergeoptions'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
M
e
rge branch
'
jc/
m
aint-add
-
p
-
overlapping-hun
k
s' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
sideban
d
_
demux
(
): fi
x
d
e
cl
-
aft
e
r-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Update draft
release
n
o
tes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
M
e
rge b
r
anc
h
'cn
/
format-patch-quiet'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C
Hamano
Mer
g
e b
r
anch
'
jm/mergetool
-
s
ubmodules' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
branch 'jk/format-pat
c
h-quot
e
-
special-in-
f
r
om
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
m
a
no
Merge branch
'vh/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_
o
pen_no
a
time(): dro
p
unused parame
t
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
sha1
_
file: ty
p
ofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Pr
e
pare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
m
an
o
Merge bran
c
h 'aw
/
ma
i
n
t
-rebase-i-p-no-ff
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch
'
js/blame-parsename'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
branch 'gr
/
cvsimport-alternativ
e
-
cvsp
a
ss-locat
i
on
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io
C
Ha
m
ano
Merge
bra
n
c
h
'cj/p4mer
g
e' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C
H
amano
Merge branch 'j
k
/merge-
o
ne-fil
e
-
work
i
ng-t
r
ee' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ranch 'jc/fix-d
i
ff-f
i
les-unmerged' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Me
r
g
e br
a
n
c
h 'mz
/
maint-ren
a
me-unmerged' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
H
a
mano
Merge branch 'jc/maint-1
.
7
.
4
-
pat
h
spe
c
-stdi
n
-and-
c
mdlin
e
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge br
a
nch 'jc/main
t
-1
.
6
.
6-
p
athspec-stdin-
a
nd-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
setup_revisions(): take pathspec from com
m
and line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C
H
a
mano
Revert "Honor $(pre
f
ix)
set in config
.
m
a
k* when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hama
n
o
t1507: avoid "${parame
t
er<o
p
>'word'}" inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C
Hamano
t3701: add-p-fix ma
k
e
s the
last tes
t
to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
m
erg
e
: make b
r
an
c
h
.
<name>
.
mergeoptions correctly ove
r
ride
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C
Hamano
Merge branc
h
'js/mai
n
t
-
1
.
6
.
6
-
send-pack-statele
s
s-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
J
unio C
H
ama
n
o
t3701: fix he
r
e
d
ocument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Gi
t
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge b
r
a
n
ch 'jh/dirs
t
at' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bra
n
c
h
'
s
p/maint-
c
lear-po
s
t
fields' i
n
to
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch 'jk/m
a
int-
s
tas
h
-oob' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C H
a
ma
n
o
Merge branch 'jk
/
m
ai
n
t-up
l
oad-pack-s
h
allow' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge bra
n
c
h 'dm/sta
s
h-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge bran
c
h 'jc/
p
ack-objects-bigfil
e
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Merge branch 'mg/reflog-wit
h
-options'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge bra
n
c
h
'
jk/stash-loosen-safety' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge branch '
a
r/clean
-
rmdir-empty' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bran
c
h 'mg/sha1-path-advise'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Ha
m
ano
"add -p":
w
ork-around an old lazin
e
ss
t
hat does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Ham
a
no
add--
i
nteractive
.
perl: factor out repeated --recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Hamano
t3701: Editin
g
a
split hunk in an "add -p" sessi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Ha
m
ano
add -p
:
'q'
sho
u
ld reall
y
q
ui
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
S
t
art 1
.
7
.
5
.
1 maintenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Haman
o
M
erge
bra
n
ch
'
m
g/
x
-years-12-mon
t
hs' int
o
maint
commit
|
commitdiff
|
tree
2011-04-26
Junio C Hamano
http: clear
POSTFIEL
D
S wh
e
n initi
a
lizing
a
slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
J
u
n
io C Hamano
Merge b
r
an
c
h 'js/m
a
in
t
-1
.
6
.
6-s
e
nd-
p
ack-sta
t
el
e
ss-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
Fix "add -u" that s
o
me
t
im
e
s
fail
s
to resolve unme
r
ge
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
d
i
f
f-fil
e
s:
s
how
u
nmerged
e
n
tries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
n
i
o
C Hamano
diff: remov
e
often unus
e
d parameters from d
i
ff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
amano
diff
.
c
:
return filepair
from
di
f
f
_u
n
merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
a
mano
tes
t
: use $_z40 from
t
est-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
Hamano
Gi
t
1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next