repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'vh/config-interactive-singlekey-doc' into maint
2011-05-31
Junio C Hamano
Mer
g
e branch 'vh/config-interac
t
ive-singleke
y
-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ham
a
no
Me
r
ge branch 'ml/tes
t
-readme' into maint
commit
|
commitdiff
|
tree
2011-05-31
J
unio
C Ha
m
a
no
Merg
e
br
a
nch
'
a
b/
i
1
8n-
f
ixu
p
' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ham
a
no
Merge bra
n
ch 'jc/rename-deg
r
ade-cc
-
to-c' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Merge branch 'rr/d
o
c-
c
o
n
tent-type
'
into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge bra
n
ch 'jm/
m
aint-misc-fix' in
t
o main
t
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge
b
ranch 'bc/maint-subm
o
d
u
l
e-fix-parked'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io
C Hamano
M
erge branch 'bc/m
a
int
-
api-doc
-
parked' into
maint
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
Hamano
Merge branch 'jn/run-co
m
mand-e
r
ror-failure' into maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io
C
H
amano
Git
1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
H
amano
Merg
e
branch 'ma
i
nt-1
.
7
.
4' into m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
ama
n
o
Merge branch 'jk/git
-
connection-deadlock-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Merge br
a
n
ch 'js/maint-s
e
nd-pa
c
k-stateless
-
rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C
Hamano
Merge bra
n
ch 'jk/maint-upload-pack-shallow'
into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Merge branch '
j
m/ma
i
n
t-dif
f
-words-with-sbe' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bra
n
ch 'kk
/
mai
n
t-prefix-in-config-m
a
k' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge branch 'mg/diff-u
i
con
f
ig-do
c
' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
J
un
i
o C Ham
a
no
Mer
g
e branch 'ft/gitweb
-
t
a
r-with-gz
i
p-n' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch
'
ss
/
doc-svn
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jn/format-patch-doc'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
bran
c
h '
j
c/maint-pathspec
-
stdi
n
-
a
n
d-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C H
a
m
ano
Merge branch 'jk/cherry
-
p
i
ck-root-with-resol
v
e' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bran
c
h 'rg/copy-gec
o
s-use
r
name' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge branch 'fc/compl
e
tion
-
zsh' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge branch
'jk/gi
t
-c
o
n
n
ectio
n
-deadlo
c
k-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge branch 'js
/
m
a
int-send
-
pack-stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Me
r
ge branch 'svn
-
fe-maint' of git
:
//repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
amano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
u
nio C Hamano
M
e
rge
b
ranch 'js
/
maint-1
.
6
.
6
-
s
end-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o
C Hamano
Update draft release no
t
es t
o
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Mer
g
e branch 'jn/ma
i
nt-for
m
at-pat
c
h-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C Hamano
Merge branch 'ss/
c
her
r
y-pick
-
x-doc'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C
H
am
a
no
Me
r
ge branc
h
'vr/m
e
rge-base-do
c
' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
M
e
rge branch 'sr/maint-fast-im
p
ort-tig
h
t
en-op
t
io
n
-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch
'jc/t1506-shell-param-ex
p
ansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C H
a
mano
M
e
r
ge branc
h
'jc/f
i
x-add-u-unmer
g
ed' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C Ham
a
no
Merge branch 'jn/gitweb-dependency'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge br
a
nch
'
jc/maint-
b
ranch-merge
o
ptions' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge b
r
an
c
h
'jc/maint-add
-
p-overlapping-hu
n
ks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
H
amano
sid
e
band_demu
x
(): fix decl-after
-
stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
Updat
e
draft
release no
t
es to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
Mer
g
e branch 'cn/format-patch
-
quiet' into m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'j
m
/mergetool-sub
m
odules'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Ha
m
ano
Merge branch '
j
k/fo
r
mat-patch-quote-spec
i
a
l
-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Merge branch 'vh/
g
it-svn
-
doc' into m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
g
it_o
p
en_n
o
a
time(): drop unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
sha1_file: t
y
p
o
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Prepare
f
or 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Ham
a
no
Merge branch 'a
w
/maint-rebase-i-p-no-ff'
into
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch
'
js/blame-parsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Me
r
ge branch 'gr/cvsimport-alternative-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Ham
a
no
Merge
branch 'cj/p4
m
erge' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge branch 'jk/merge-one-file-workin
g
-tree'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge
bra
n
ch 'jc/
f
ix-diff-files-un
m
erg
e
d' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
H
a
m
ano
Merge
b
r
anch 'mz/ma
i
nt-
r
e
nam
e
-un
m
erged' into m
a
int
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Haman
o
Mer
g
e
b
ranch 'jc/maint-1
.
7
.
4-paths
p
ec-stdin-an
d
-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
amano
M
erge branch 'jc/maint
-
1
.
6
.
6-pa
t
hsp
e
c-stdin-
a
n
d
-
c
mdline'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hamano
s
etup_r
e
visions(): take pa
t
hspec
f
rom command
l
ine
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
unio C Hamano
R
e
vert "Hono
r
$(
p
r
e
f
i
x) set in c
o
nfig
.
mak* when
d
efining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t1507: avoid "${parameter<op
>
'word'
}
" ins
i
de
d
ouble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio
C
Hamano
t3701: add-p-fi
x
makes the las
t
tes
t
t
o
p
a
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hama
n
o
m
e
r
g
e: make branch
.
<name>
.
m
ergeopti
o
ns correc
t
ly overri
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hama
n
o
Me
r
ge branch 'js/maint-1
.
6
.
6-send-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
J
u
nio
C
Hamano
t3701: fix
h
ere document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
n
o
Gi
t
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/dir
s
tat' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merge branch '
s
p/
m
a
int-clear-postfield
s
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
nch 'jk/mai
n
t-stash-o
o
b'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge bra
n
ch 'jk/maint-up
l
oad
-
pack-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
H
a
mano
Merge bra
n
c
h
'dm
/
s
tas
h
-k-i-p
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o C Hamano
Merge bra
n
ch 'jc/pa
c
k-
o
bjects-big
f
ile' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C Hamano
M
e
rge
branch '
m
g
/
r
ef
l
o
g
-
with-options' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o
C Hamano
Me
r
ge branch 'jk/stash-l
o
o
s
en-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
mano
M
e
rge branch
'ar/clean-rmdir-emp
t
y' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge branch
'mg
/
sha1-
p
ath-advise' into maint
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"add -p
"
: work-around an
old
l
aziness
t
hat does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Ha
m
ano
add--i
n
teracti
v
e
.
per
l
: factor out re
p
e
at
e
d -
-
r
e
c
o
unt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3701: Editing a split hunk in an
"
add
-p" s
e
s
sion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
a
dd -p: '
q
'
should really q
u
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Ham
a
no
Start 1
.
7
.
5
.
1 m
a
intenance
t
r
ac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hamano
M
erge
branch 'mg/x-years
-
1
2-
m
onths'
i
nto maint
commit
|
commitdiff
|
tree
2011-04-26
Ju
n
io C H
a
mano
htt
p
:
cle
a
r
P
OSTFIELDS
w
hen i
n
itializi
n
g a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Ha
m
ano
Merge br
a
nch
'
js/maint-1
.
6
.
6-send
-
pack-s
t
ateles
s
-
rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
aman
o
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fix "add
-u" that sometime
s
fails to
r
esolve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
i
ff
-
fil
e
s: sh
o
w unmerged entr
i
es correc
t
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
diff
:
remove often unus
e
d parameters from
diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
a
no
diff
.
c: return filepair f
r
o
m diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
test: use $_z40 from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Git 1
.
7
.
5-
r
c3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
unio C Haman
o
Sync with
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Reve
r
t "ru
n
-comm
a
nd
:
prett
i
fy -D_FO
R
T
I
FY_SO
U
RCE wor
k
around"
commit
|
commitdiff
|
tree
2011-04-15
J
unio C
H
amano
Merge v1
.
7
.
5-rc
2
int
o
jn/format
-
patc
h
-
d
o
c
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
i18n
:
use t
e
st_i1
8
n{
c
mp,grep} in
t
760
0
, t760
7
, t76
1
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Haman
o
i18n
:
use test_i18n{grep,cmp} in t7508
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Haman
o
i
18n:
u
se
test_i
1
8ngrep in t7506
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio C
H
am
a
no
Merge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C
H
ama
n
o
i18
n
: us
e
test_i18ngrep and test_i18ncmp i
n
t7502
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
i18n:
use test_i18ngr
e
p in
t
7501
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next