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 'jn/maint-test-merge-verify-parents'
2011-05-11
Jun
i
o C Ham
a
no
Merge br
a
nch 'jn/m
a
i
n
t
-
test-
m
erge-verify-parents
'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
M
e
rge bran
c
h 'v
h
/co
n
fig-i
n
teractive-singlekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
i
o C H
a
mano
Merge branch 'jc/ma
i
n
t
-
a
dd-p-ov
e
rla
p
ping-
h
unks'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C H
a
mano
Me
r
ge b
r
anch 'sr
/
m
aint-fast-import-t
i
ghten-option-parsin
g
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge bra
n
ch 'dm/ht
t
p-c
l
eanup
'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio
C
Hamano
Merge branc
h
'jn/ctags'
commit
|
commitdiff
|
tree
2011-05-08
Junio C H
a
man
o
t
3701: add-p-fix
m
ake
s
the
last test to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jona
t
han Nieder
tests: tea
c
h verify_parents
to check for extra parents
Reported-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jona
t
han Nieder
tests: e
l
iminate
unnece
s
sa
r
y setup test assertions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
u
ni
o
C Hamano
Update dra
f
t
re
l
ease notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Ha
m
a
no
M
erge branch '
j
n
/
run-command-e
r
ror-failure'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
e
rge b
r
anch 'js/info-man-
p
ath'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io
C H
a
mano
Merge bra
n
ch 'im/hash
c
m
p
-optim'
commit
|
commitdiff
|
tree
2011-05-06
J
unio
C
Hamano
Merge branch 'jk/merge-one-file-w
o
r
king-tree'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
a
mano
Merg
e
b
r
anch 'jc/fix-diff-f
i
les-unmer
g
ed'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Haman
o
M
erge branch 'c
j
/p4mer
g
e'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge
b
ranch
'
gr/cvsimport-al
t
e
rnative-cvspass-location'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Ha
m
ano
Merge bran
c
h 'sg/comp
l
e
t
i
on-cleanup'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'js/blame
-
parse
n
ame'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Ha
m
ano
M
e
rge bra
n
ch 'jk/format-p
a
tc
h
-quo
t
e
-
spe
c
ial-in-from'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Merge branch 'nd/s
t
ruct-pathspec'
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
mano
Merge branch 'aw/maint-
r
ebase-i-p-no-ff'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C
H
amano
Merge branch 'mg/alias
-
expose-prefix'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C H
a
mano
Merge branch 'mg/diff-uiconfig-doc'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-05-06
João Britto
Remo
v
e dup
l
i
cated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabbelier
fa
s
t-import: fix o
p
tion parser for no-arg
o
ptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-05-05
Valen
t
in Haenel
git-reset
.
txt: better docs f
o
r '--
p
atc
h
'
Mentored-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Vale
n
ti
n
Haenel
git-checkout
.
t
xt:
b
etter docs for
'--patch
'
Mentored-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Vale
n
t
i
n
H
aenel
g
i
t-stash
.
txt: b
e
tter docs for
'--pa
t
ch'
Mentored-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Valentin Haen
e
l
g
it-add
.
txt: document 'inte
r
ac
t
ive
.
s
i
nglekey'
Mentored-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Valenti
n
Haenel
config
.
txt: 'interactiv
e
.
s
i
nglekey;
i
s
used
by
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io C Hama
n
o
t3701: f
i
x
h
e
re document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Micha
e
l J Gruber
git-fast-impor
t
.
txt:
--relative-mar
k
s
t
a
kes no paramete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Di
m
a Sharov
shell: ad
d
missing in
i
tial
i
zation of argv0
_
p
a
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhar
d
t
t/annotate-tests: Use echo & ca
t
instead of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
mano
U
p
dat
e
d
r
aft rel
e
ase not
e
s to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge
br
a
nch
'ml/test-readme'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'ft/
g
itweb-tar-
w
i
t
h-gzip-
n
'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Haman
o
Merge b
r
anch
'
mg/rev-list-co
u
nt-c
h
erry'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'ss/doc-svn'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bra
n
ch
'jn/fo
r
mat-patc
h
-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e bran
c
h
'
vr
/
merge-bas
e
-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge branch
'
ss
/
c
h
erry-pick-x-
d
oc'
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge bra
n
c
h
'
jn/m
a
int-for
m
at-patch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge
b
r
anch 'jk/format-patch-m
u
l
til
i
ne-header'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branch 'jm/mer
g
etool-submod
u
les'
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C H
a
ma
n
o
S
ync with
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Ham
a
no
Git
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
M
er
g
e branch 'jh/dirst
a
t' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
M
erge branch 'sp/maint
-
cle
a
r-postfields'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o C Hamano
Me
r
ge b
r
an
c
h 'jk/ma
i
nt-sta
s
h-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/main
t
-
u
pload
-
pack
-
sh
a
llow' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge
b
ra
n
c
h
'dm/stash-k-i-p' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
M
erge branch 'jc
/
pack-objects-
b
i
gfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch 'mg/re
f
l
o
g-with-options
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o C Hamano
Mer
g
e
b
ranch 'j
k
/st
a
sh
-
loosen-safety' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C Ha
m
a
n
o
M
e
rge bra
n
ch 'ar
/
clean-rm
d
ir
-
empty'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
nch 'mg/sha1-path-advise' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Vale
n
ti
n
Haenel
git
-
add
.
txt: document '
a
dd
.
ign
o
reErrors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Tay Ray
C
huan
t5541-http-p
u
sh:
add test f
o
r ch
u
nked
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Dan
M
cGee
http-
p
ush: refact
o
r curl_easy_setup madness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Dan
McGee
http-push:
use con
s
t f
o
r st
r
ings in signatures
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
D
an McGee
http: make
c
ur
l
callb
a
c
k
s match contracts from cur
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Ju
n
io C Hamano
Update draft release
note
s
to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Me
r
ge bra
n
ch 'j
k
/notes-ui-updates'
commit
|
commitdiff
|
tree
2011-05-02
Junio C H
a
mano
Merg
e
branch 'ab/i18n-fixup'
commit
|
commitdiff
|
tree
2011-05-02
Junio C
H
a
mano
M
e
rge branch
'
nm/su
b
m
odule
-
update-force'
commit
|
commitdiff
|
tree
2011-05-02
Junio C H
a
mano
Merge branch 'jh/notes-a
d
d-ui'
commit
|
commitdiff
|
tree
2011-05-02
Junio
C
H
amano
M
erge bra
n
ch 'nd/mai
n
t
-
setup'
commit
|
commitdiff
|
tree
2011-05-02
Jun
i
o C Hamano
Merge branch 'm
z
/mai
n
t-re
n
ame-
u
nmer
g
ed'
commit
|
commitdiff
|
tree
2011-05-02
Jona
t
han Nieder
D
o
cumentation: clarif
y
meani
n
g
of --html-pat
h
, --ma
n
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
J
o
n Seymou
r
git:
a
dd --info-
p
ath and --
m
an-path option
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
Update
draft release
n
o
t
es to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Junio
C
Hamano
Me
r
ge br
a
nch
'
r
s
/
str
b
uf-setlen-assert'
commit
|
commitdiff
|
tree
2011-05-01
J
unio C Hamano
Merge b
r
anch 'vh
/
git-s
v
n-doc'
commit
|
commitdiff
|
tree
2011-05-01
Ci
a
ran Jess
u
p
Pass empty file to p4merge whe
r
e no base is suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
L
o
ok for pass
w
ord in both CVS and CV
S
NT pas
s
word files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff K
i
ng
merge-one
-
file: fix broken merges w
i
th alternate wor
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests for merge-index
/
merge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
"
a
d
d
-p": work-ar
o
und
an
o
ld lazi
n
ess t
h
a
t doe
s
not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C
H
amano
add--in
t
e
r
a
c
tive
.
perl:
factor out re
p
eated
--rec
o
unt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
t
3
7
0
1: Edit
i
ng a split hunk in
a
n "
a
dd -p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
amano
add
-
p
:
'q
'
should rea
l
ly quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jakub Nareb
s
k
i
gitweb: Mark matche
d
'ctag' / con
t
ents tag (?
b
y_tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jaku
b
N
arebski
g
i
tweb
:
Change
th
e
w
a
y "content
tags"
(
'ctags') are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jakub N
a
rebs
k
i
gi
t
web: R
e
structure projects list generation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
Merge
b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C
Hamano
S
t
art 1
.
7
.
5
.
1 main
t
enance
track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C H
a
m
a
no
Merge br
a
nch 'mg/x-years-
1
2-months' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvai
n
Rabot
g
i
t-se
n
d-email: fix missing space
i
n err
o
r me
s
sage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blam
e
:
tolerate bo
g
us
e-mail
addresses a bit
be
t
ter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Mathia
s
Lafeldt
t/test-l
i
b
.
sh: m
i
n
o
r
rea
d
ability imp
r
ovements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jim
Me
y
ering
diff
c
or
e
-rename
.
c: avoid set-but-not-used war
n
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Jun
i
o C Ha
m
a
n
o
M
e
rge branch 'jc/diff-
i
rreversible-
d
elete'
commit
|
commitdiff
|
tree
2011-04-28
Junio C
H
a
mano
Merge bra
n
ch '
j
c/rename-deg
r
ade-cc-to-c'
commit
|
commitdiff
|
tree
2011-04-28
Jun
i
o C H
a
mano
Merge branch 'mz/reba
s
e'
commit
|
commitdiff
|
tree
2011-04-28
Junio
C
Hamano
Merge branch 'en/merge-re
c
ursive'
commit
|
commitdiff
|
tree
2011-04-28
Jun
i
o
C Hama
n
o
Merge branch
'jh/dirstat'
commit
|
commitdiff
|
tree
next