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 'jc/maint-branch-mergeoptions'
2011-05-11
J
u
nio C
Hamano
Mer
g
e
branch 'jc/maint-b
r
anch-mergeo
p
tions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
erge
branch
'jn/maint-test-merge-verify-p
a
re
n
ts'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o
C Hamano
M
e
r
g
e
b
r
an
c
h
'vh/co
n
fig-i
n
t
eract
i
ve-si
n
glekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
Merge branch '
j
c/maint-
a
dd-p-overlapping-hun
k
s'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merg
e
b
r
an
c
h
'
s
r/maint-fa
s
t-impo
r
t-tighten-option-parsing'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Ham
a
n
o
M
e
rge branch 'dm/h
t
tp
-
cleanup'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Merg
e
branch 'jn/ctags'
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3
7
01: add-p-fix
makes the
last test to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jon
a
than Nieder
tests: teach verify
_
pa
r
ents to c
h
eck 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
Jun
i
o C Hamano
merge: make bran
c
h
.
<name>
.
mergeoptions
correctly overr
i
de
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan Nied
e
r
tests
:
e
l
i
mina
t
e unnecessary setup test assertions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Hamano
Upd
a
te dr
a
f
t release not
e
s to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
aman
o
Merge branch
'jn
/
run-
c
om
m
and-error-fail
u
re'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Merge br
a
nch
'
js/info-man-path'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'im/h
a
shc
m
p
-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'jk
/
merge-one-file-working
-
tr
e
e'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C
Hamano
Mer
g
e branch 'jc/fix
-
d
iff-
f
i
les-u
n
merge
d
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'cj/p4m
e
rge'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio
C
H
a
mano
M
erg
e
b
r
anch 'gr/
c
vsimport-alte
r
na
t
ive-cvspass-loc
a
tion'
commit
|
commitdiff
|
tree
2011-05-06
J
un
i
o
C Hamano
Merge branc
h
'sg/
c
om
p
l
etion-clea
n
up'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C
H
a
m
ano
Merge
branch 'js/bla
m
e-par
s
ename'
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
mano
Merge
branch 'jk/
f
ormat-patch-quo
t
e
-
special
-
in-fr
o
m'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
Merge branch 'nd
/
struct-pa
t
hspec'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch
'
aw/ma
i
nt-rebas
e
-i-p-no-ff'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge b
r
anch 'mg/alias-
e
x
p
os
e
-pr
e
fix'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Merge branch 'mg/diff-uiconfig-doc
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2011-05-06
João Britto
R
emo
v
e
d
u
plicat
e
d "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rab
b
elier
f
ast-import: fix
o
p
t
ion
parser for n
o
-arg op
t
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-05-05
Valentin Haene
l
git-reset
.
t
x
t: better doc
s
for '--pat
c
h'
Mentored-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Valentin Haenel
git-c
h
eckout
.
tx
t
: better 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
Valentin Haenel
git-
s
tash
.
txt: bett
e
r 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
Val
e
nt
i
n Haenel
git-add
.
t
x
t
: d
o
cument 'interac
t
ive
.
singlekey
'
Mentored-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Valentin Haenel
confi
g
.
txt: 'interactive
.
single
k
ey; is used by
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C Hamano
t3701: f
i
x here document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mi
c
hael J Grube
r
git
-
fast-i
m
port
.
t
x
t: --relative-mark
s
takes
no
p
a
ram
e
ter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima
Sharov
shell: add missing initia
l
i
z
a
t
ion of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t
/ann
o
tate-tests: Use echo & cat ins
t
ead of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o C H
a
mano
Update draf
t
rele
a
se
notes
to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merge branch 'ml/test-readme'
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C H
a
ma
n
o
Merge branch 'ft/gitweb-ta
r
-with-gzip-n'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hamano
Merge branc
h
'mg/rev-list-co
u
nt-cherry'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
anch 'ss/do
c
-svn'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
H
amano
Merge b
r
anch 'j
n
/for
m
at-patc
h
-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C H
a
mano
Merge bran
c
h 'vr/merge-base-
d
o
c'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge bran
c
h 'ss/cherry-pick
-
x-doc'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C
Hamano
Merge
b
r
a
n
c
h 'jn/maint-format-patch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
man
o
M
erge
b
ran
c
h 'jk/format-patch-
m
ul
t
iline-header'
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C Hama
n
o
Merge branc
h
'
j
m/mergetool-submodules'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Sync with 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
unio C
H
a
m
a
no
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
man
o
Merge
branc
h
'jh/dirsta
t
'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
a
n
o
Merge bran
c
h
's
p
/maint-clear-postfields' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
anch 'jk/maint-st
a
sh-o
o
b' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Me
r
ge branc
h
'jk/maint
-
uploa
d
-pack-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
a
mano
Merge branch 'dm/stas
h
-
k
-i-p' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge bra
n
ch
'jc/
p
ack
-
objects-bigfi
l
e' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
M
e
rge b
r
anch 'mg/reflog-with-options' into main
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o C Hamano
Merge b
r
an
c
h 'jk
/
stash-loose
n
-s
a
fety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Mer
g
e
branch 'ar/clean-rmdi
r
-empty' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
nch 'mg/s
h
a1-path-advise
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
V
a
len
t
in H
a
e
n
el
git-add
.
txt: document 'add
.
i
gnoreErro
r
s
'
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 Chu
a
n
t
5541-http-push: add test for
chunked
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Dan McGee
htt
p
-
pu
s
h:
r
efactor curl_easy_setup mad
n
ess
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Dan
M
c
G
ee
ht
t
p-
p
ush: use const for
strings in si
g
natures
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Dan
McGe
e
ht
t
p: make cur
l
call
b
acks
match contracts
f
r
om curl
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
J
unio C Hama
n
o
Update draft release
note
s
to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Jun
i
o C Hamano
M
e
r
g
e b
r
a
nch
'jk/note
s
-
ui
-
update
s
'
commit
|
commitdiff
|
tree
2011-05-02
J
u
n
i
o C Hamano
Merge b
r
anch 'ab
/
i18n-
f
i
xup'
commit
|
commitdiff
|
tree
2011-05-02
J
u
n
io C Hamano
Merge
b
ranch 'nm/submodule-update-for
c
e
'
commit
|
commitdiff
|
tree
2011-05-02
Junio
C
Hamano
M
e
rge br
a
nch 'jh/note
s
-add-ui'
commit
|
commitdiff
|
tree
2011-05-02
Ju
n
i
o
C H
a
mano
Merge b
r
anch 'nd/ma
i
nt-setup'
commit
|
commitdiff
|
tree
2011-05-02
Junio C
H
am
a
no
M
erge branch 'mz/ma
i
n
t-rename-unmerged'
commit
|
commitdiff
|
tree
2011-05-02
J
o
nathan
N
i
eder
Doc
u
mentation: clarify
m
e
a
ning of --html-path,
-
-
man
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Jon Seymour
git:
a
dd
-
-i
n
fo-path and
-
-man-path
o
ptio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Junio
C
Hamano
U
pdate d
r
aft
release notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Juni
o
C Haman
o
Merge
bra
n
ch 'rs/strbuf-setle
n
-assert'
commit
|
commitdiff
|
tree
2011-05-01
Juni
o
C Ha
m
ano
Merge branch 'v
h
/
g
it-
s
v
n
-doc'
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jessup
P
a
s
s empty file to
p4merge wher
e
no base is s
u
itable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouil
l
ier
Look for pass
w
or
d
i
n
both
CVS and C
V
SNT
passwor
d
files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merg
e
-one-file:
fix
b
r
oken merges
w
ith alterna
t
e work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Je
f
f King
add tes
t
s for merge-index /
merge-on
e
-fil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C H
a
mano
"ad
d
-
p": work-around
an
old la
z
iness
t
hat does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Haman
o
a
d
d--interactive
.
perl: factor out repeated --recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
t3701: Editin
g
a split
h
unk
i
n
an "add -p
"
session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Haman
o
a
d
d -p: 'q' s
h
ould reall
y
quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
a
kub Narebski
g
itwe
b
: Mark ma
t
c
h
ed
'c
t
ag' / c
o
ntents tag (?by_tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
a
kub
N
a
r
ebski
gitweb: Change the way "c
o
nt
e
nt tags" ('ctags') ar
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ja
k
ub N
a
rebski
gi
t
web: Restructure pr
o
jects
list
g
ener
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hamano
Merg
e
bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
Start 1
.
7
.
5
.
1 maintenance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C
H
a
man
o
Merge branch 'mg/x-years-12-months' into main
t
commit
|
commitdiff
|
tree
2011-04-29
Sylvain R
a
b
ot
git-s
e
nd-em
a
il: fix mis
s
i
n
g sp
a
c
e
i
n e
r
ror m
e
ssage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Ston
e
blame: to
l
e
r
a
te bo
g
us
e
-mail addresse
s
a bit
better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
M
a
t
h
ias La
f
e
l
d
t
t
/
tes
t
-lib
.
sh:
minor rea
d
abilit
y
improv
e
ments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jim Meyeri
n
g
diffcore-r
e
name
.
c: avoid set-but-not-use
d
w
a
rning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Junio C
H
a
m
a
n
o
Merge bran
c
h 'jc/diff-i
r
reversible-d
e
lete'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Haman
o
M
erge b
r
anch 'jc
/
rename-degrade-cc-
t
o
-c
'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Haman
o
Merge branch 'mz/rebase'
commit
|
commitdiff
|
tree
next