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/fetch-mark-complete-optimization'
2011-05-09
Jun
i
o C
H
am
a
no
index_fd():
t
u
rn w
r
ite_obje
c
t and f
o
r
mat_
c
h
eck ar
g
u
m
ents
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Ham
a
no
t15
0
7: avoid "${parameter<op>'word'}" insi
d
e doubl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jonathan Niede
r
completion: move priv
a
te sho
p
t sh
i
m for zsh to __git_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C H
a
mano
t
3
701
:
add-p-
f
i
x
makes the
l
ast test to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Ju
n
io C Hamano
rerere
:
libify re
r
ere_cle
a
r() and rerer
e
_g
c
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Conr
a
d I
r
win
Use
a temporary index
f
or git commit --inter
a
ctive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub N
a
rebski
R
e
m
o
ve
g
itweb/gitweb
.
cg
i
and other
legac
y
targets fr
o
m
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
a
k
u
b
Nare
b
ski
git
-
instawe
b
: Simplify build dependency
o
n
gitweb
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan Niede
r
test
s
:
check git does not barf on
merge
.
ff values fo
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan Nieder
tes
t
s
:
teach verify_parents
to
check
f
or extra pa
r
ents
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
merge:
i
ntroduce merge
.
f
f
c
o
nfiguration variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
u
n
io C Haman
o
Merge branch
'jc/mai
n
t
-
branch-m
e
rgeoptions' into
m
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
m
er
g
e: make branch
.
<name
>
.
mergeopti
o
ns corre
c
tly over
r
ide
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jonathan
N
i
e
der
tests: eliminate
u
nnecessary setup test as
s
ertions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Update
d
raft re
l
eas
e
notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
m
ano
Merge br
a
nch 'jn/run-comm
a
nd-error-failure'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o
C
H
amano
Merge branch 'js/info-man-p
a
th'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Ha
m
ano
Merge
b
r
anch 'im
/
hashcmp-op
t
i
m
'
commit
|
commitdiff
|
tree
2011-05-06
J
uni
o
C Hamano
Mer
g
e bra
n
c
h
'jk/
m
erge
-
o
ne-file-working-t
r
ee'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ha
m
ano
Merge
b
ranch
'
jc/f
i
x-
d
iff-fi
l
es-unmerg
e
d'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge
bra
n
ch '
c
j/p4merge'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hama
n
o
M
erge branch
'
gr
/
c
v
simp
o
rt-alter
n
a
tive-cvs
p
a
ss-location'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
Merge branch 'sg/completion-c
l
eanu
p
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'js/blame-parsename
'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o
C Hamano
M
e
r
g
e branch 'jk/format-patc
h
-quot
e
-
s
pecial-in-f
r
om
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
mano
Merge branch 'nd/struct-
p
athspec'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io
C
H
a
mano
Merge branch '
a
w
/
main
t
-
r
e
base-i-p
-
no
-
ff'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'mg/alias-expo
s
e-prefix'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C
Hamano
Merge branch 'm
g
/diff-ui
c
onfig-doc'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
Merge
b
r
anc
h
'
maint'
commit
|
commitdiff
|
tree
2011-05-06
J
oão Br
i
tto
Remove
d
uplica
t
ed "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre Rabbelie
r
fast-impor
t
: fix option parser for no-a
r
g options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Mer
g
e
branch 'js/
m
aint-1
.
6
.
6-se
n
d-pack-statel
e
ss
-
rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff Ki
n
g
send-pac
k
: unbreak push over sta
t
el
e
ss rpc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Va
l
e
ntin Haenel
g
i
t
-reset
.
txt:
better doc
s
f
or '--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
gi
t
-ch
e
ckou
t
.
t
xt:
b
ette
r
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
Valenti
n
Haenel
git-stash
.
txt: 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
Val
e
ntin H
a
enel
git-add
.
txt
:
docume
n
t
'in
t
eractive
.
singlekey'
Mentored-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Va
l
entin Ha
e
nel
config
.
txt: 'interactive
.
si
n
g
l
ek
e
y; is use
d
b
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io C Hamano
t3701: fix her
e
document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gru
b
er
git-fa
s
t-impo
r
t
.
txt: --r
e
lative-ma
r
ks
t
a
kes
n
o
parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
shell: a
d
d
m
issing ini
t
ialization of argv0_
p
ath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
B
rian Gernhardt
t/an
n
otate
-
tests: Use echo
&
cat instead
of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Update dra
f
t release note
s
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Merge branch 'm
l
/te
s
t-readm
e
'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
aman
o
Merge branch
'
f
t
/gitweb-tar-with-
g
zip-n'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merg
e
branch 'mg/rev-list-count-ch
e
r
r
y'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge br
a
n
c
h 'ss/doc-s
v
n'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
M
e
rge br
a
nch 'jn/format-p
a
tch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Ham
a
n
o
Merge
b
ra
n
ch 'vr/m
e
rg
e
-base-doc
'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
aman
o
Merge
b
ranch 'ss/c
h
erry-pick-x-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
r
a
nch 'jn/maint-format-patch-doc'
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o
C
H
amano
Merg
e
branch 'jk/fo
r
mat
-
patch-multil
i
n
e-header'
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
M
erge branc
h
'jm/merge
t
ool-submodules
'
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Ha
m
ano
S
y
nc with 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
Me
r
ge branch '
j
h/dirstat' i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hamano
Merge b
r
anch 'sp/maint
-
clea
r
-p
o
s
tfi
e
lds'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branch 'jk/maint-stash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branch 'jk
/
maint-upload-pack-
s
hallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bra
n
c
h
'
dm/stash-k-i-p
'
into
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Ham
a
no
Merge branch 'jc/pac
k
-object
s
-bigfile' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
unio C
H
am
a
no
Merge branch 'mg/reflog-with-options' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
M
e
rge branch
'
j
k
/
stash-loo
s
en-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Haman
o
Merge branch 'ar/cle
a
n-rmdir-emp
t
y'
i
n
t
o main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
M
erge branch 'mg/sha1-path-
a
dvis
e
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
git-ad
d
.
txt: documen
t
'add
.
ignore
E
rrors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Tay
R
ay
Ch
u
an
t
5
541-http-pus
h
: add test
f
or chunked
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Dan McGee
http-pu
s
h: refactor curl_easy_se
t
up madne
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
D
a
n McGee
http-
p
u
sh: use const for strin
g
s in sign
a
tures
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Dan McGee
http:
m
ake curl
callback
s
match co
n
tract
s
f
ro
m
curl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Ju
n
io C
H
amano
Updat
e
d
r
a
f
t releas
e
n
o
t
es to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
J
u
nio C
H
amano
M
e
rge bra
n
c
h
'jk/n
o
tes-ui-updates'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Mer
g
e
branch 'ab/i18n-fixup'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hama
n
o
Merge b
r
anch 'nm/s
u
bmodu
l
e-u
p
date-force'
commit
|
commitdiff
|
tree
2011-05-02
J
unio C Hamano
Mer
g
e
branch 'jh/n
o
tes-ad
d
-ui'
commit
|
commitdiff
|
tree
2011-05-02
Junio
C
Ham
a
no
M
erge branch
'nd/mai
n
t-setup'
commit
|
commitdiff
|
tree
2011-05-02
J
u
nio C
Hamano
Merg
e
b
r
anc
h
'mz/maint-rename-unmerged
'
commit
|
commitdiff
|
tree
2011-05-02
Jonat
h
an
N
ieder
Documentatio
n
: clarify me
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
J
on Seymo
u
r
git:
add
-
-
i
nf
o
-
path and -
-
m
a
n
-path
o
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Junio C Ha
m
ano
Update d
r
aft release
n
o
t
es t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
M
erge br
a
n
c
h 'rs/strb
u
f-setle
n
-assert'
commit
|
commitdiff
|
tree
2011-05-01
Ju
n
i
o C Hamano
Merge bra
n
ch 'vh/git-svn-doc'
commit
|
commitdiff
|
tree
2011-05-01
Ciaran
J
essu
p
Pass empty file to p4merge
w
h
ere no base
is suitabl
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Look for pass
w
o
rd i
n
both CVS and CVSNT password
f
iles
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff K
i
n
g
merge
-
one-file: fix bro
k
en merges w
i
th alterna
t
e work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
K
ing
a
dd tests for
m
erge-
i
ndex
/
merge-
o
ne
-
f
i
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
"add -p":
w
ork-
a
round an old laziness th
a
t
d
o
es not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Ha
m
ano
add-
-
inter
a
ctive
.
perl: fa
c
tor
o
u
t repea
t
ed --re
c
ount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
t
3
701:
Editi
n
g
a
s
plit hun
k
in
a
n
"
add -p" sessio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
mano
add -p: 'q'
s
hould really qu
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Se
b
astien Ceve
y
gitweb: Optional gr
o
uping
o
f p
r
ojects by cat
e
g
o
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jakub
N
a
rebski
gitweb: Mark
matched 'ctag' / contents tag (?by_tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
S
ebastien Ceve
y
g
itweb: Mo
d
ula
r
ized git_get_pr
o
j
e
ct_de
s
cription to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jakub Narebsk
i
g
itweb:
Chan
g
e the way "content tags" ('ctags
'
) are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
S
eb
a
stien
Cevey
gitweb
:
Split git_project_l
i
s
t
_b
o
dy in two
f
unctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
a
ku
b
Nar
e
bski
gitweb
:
Re
s
tructu
r
e projects list
ge
n
e
r
ati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hama
n
o
Start 1
.
7
.
5
.
1 ma
i
ntenance
track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next