repo.or.cz
/
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/cherry-pick-root-with-resolve'
2011-05-06
Juni
o
C Hamano
Up
d
ate dr
a
f
t
release no
t
es to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Ham
a
no
Merge branc
h
'jn/run-co
m
mand-error-failure'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
i
o
C Hamano
Merg
e
branch 'js/info-man-path'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Mer
g
e bra
n
ch 'im/h
a
shc
m
p-o
p
tim'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch
'jk/merge
-
one-file-working-tree'
commit
|
commitdiff
|
tree
2011-05-06
J
u
n
io C
Hamano
Merge branch 'jc/fix-diff-fi
l
e
s
-unmerged'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
Merg
e
bran
c
h '
c
j
/
p
4
me
r
ge'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'gr/cvsimp
o
rt-alternative-cvspas
s
-location'
commit
|
commitdiff
|
tree
2011-05-06
J
un
i
o C H
a
m
a
no
M
e
r
ge branch 'sg/comp
l
eti
o
n-cleanup'
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
mano
Merge branch 'js/blame-parsena
m
e
'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Hamano
M
erge branc
h
'jk/forma
t
-patch
-
quote-sp
e
cial
-
in-from'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Merge branch 'nd/str
u
ct-p
a
t
hspec'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
Merge branch
'
aw/maint-rebase-i-p-no-ff'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'mg/alias-expose-pr
e
fix'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Ha
m
ano
M
erge bra
n
ch 'mg/diff-u
i
conf
i
g-
d
o
c
'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-06
João B
r
itto
Remove duplicated "is a
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
S
v
e
rre Rabbelier
fa
s
t-impo
r
t:
f
ix option parser
f
or no-
a
rg opti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Merge bra
n
ch
'maint
'
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ha
m
ano
Mer
g
e
b
ranch '
j
s
/maint-1
.
6
.
6
-
send-pack-stat
e
less
-
rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Je
f
f King
send-pack: unb
r
ea
k
push over
s
tateless rpc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
V
a
lentin
Haenel
git-reset
.
txt: be
t
ter 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
tin Ha
e
nel
git
-
checkout
.
txt: b
e
tter docs
f
or
'--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
Va
l
entin Haenel
git-stash
.
txt: bett
e
r docs f
o
r '--patch'
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
enti
n
Haenel
git-add
.
txt: document 'inte
r
active
.
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
V
a
lenti
n
H
aenel
config
.
tx
t
: 'interactive
.
singlekey; is use
d
b
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C
H
a
man
o
t3701:
fix here document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael J
G
ruber
g
i
t-fast-
i
mpo
r
t
.
txt: --relat
i
ve
-
mar
k
s takes no paramete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sha
r
o
v
shell: add
missing initialization of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Br
i
a
n
Ge
r
nha
r
dt
t/annot
a
te-tests:
U
s
e echo & ca
t
in
s
tead of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Upd
a
te draft releas
e
notes t
o
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merg
e
branch
'
ml/test-readme'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branc
h
'ft/gitw
e
b
-tar-with-gzip-n'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
r
ge
branch 'm
g
/rev-list-count
-
cherry'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge b
r
anch 'ss
/
d
oc-svn'
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Mer
g
e branch 'jn/format-patch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
mano
Merge
b
ranch
'
vr/me
r
ge-b
a
se-doc'
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Ham
a
n
o
Merg
e
branch 'ss/
c
h
e
rry-
p
ick
-
x-
d
oc'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Me
r
ge bran
c
h 'jn/maint-format-patch-d
o
c'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge
branch 'j
k
/format-patch-multil
i
ne
-
header'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge b
r
anch '
j
m/merg
e
tool-sub
m
odules
'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Syn
c
with
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
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
Jun
i
o C Ham
a
no
M
e
rge
b
ra
n
ch 'jh/dirstat' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
anch 'sp/maint-cl
e
a
r
-p
o
stfields' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Ham
a
no
Merge branch
'jk/maint-stash-
o
ob' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
anch 'jk/maint-upload-pack-shallow' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch
'dm/stash-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Mer
g
e
branch 'jc/pack-objects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Me
r
g
e
branch 'mg/reflog-w
i
th-options' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge branch
'
jk/s
t
ash-loosen
-
safe
t
y' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge branch '
a
r/
c
lean
-
rmdir-e
m
pt
y
' into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
M
e
r
ge bran
c
h
'
mg/s
h
a1-pat
h
-advise' int
o
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Vale
n
tin Ha
e
nel
gi
t
-add
.
txt: documen
t
'
a
d
d
.
ignor
e
Errors'
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-push: add tes
t
for chu
n
k
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Da
n
McGee
htt
p
-pus
h
: refacto
r
c
url
_
easy_se
t
u
p
madne
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Dan McGee
h
t
tp-push: use con
s
t for str
i
ngs i
n
signat
u
res
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Dan McGee
http: make cu
r
l
callbacks
m
atch contracts from cu
r
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
J
unio C Hamano
Upda
t
e
draft r
e
lease notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Merge bra
n
ch 'jk/notes-ui-updates'
commit
|
commitdiff
|
tree
2011-05-02
Jun
i
o C Hamano
Merge branch 'ab
/
i18n
-
fi
x
u
p'
commit
|
commitdiff
|
tree
2011-05-02
J
u
n
io C Ham
a
no
Merge bran
c
h 'nm/submodule-update-force'
commit
|
commitdiff
|
tree
2011-05-02
J
u
nio C Ham
a
n
o
Merge branch
'
jh/n
o
tes
-
add-ui
'
commit
|
commitdiff
|
tree
2011-05-02
Juni
o
C Ha
m
ano
M
e
rge branch 'nd/m
a
int-setu
p
'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hama
n
o
Merge bran
c
h 'mz/maint-rename-unmerged'
commit
|
commitdiff
|
tree
2011-05-02
Jonathan
N
ieder
Docu
m
entation: cla
r
ify meaning
of -
-
ht
m
l-path, --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
Jon Seymour
git: add --
i
nf
o
-path and -
-
man-path
options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Junio C H
a
mano
Update d
r
aft release notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
Mer
g
e branch 'rs/strbuf-setlen
-
assert'
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
M
erge branch 'vh/git-
s
v
n
-
do
c
'
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jessup
Pas
s
e
m
p
ty
f
ile to p4merge where
no b
a
se is
s
u
it
a
bl
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
G
uy
R
ouillier
Look for password in both
CVS and
C
V
SNT
pa
s
sword f
i
les
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
m
erge-one-f
i
le:
fix b
r
oken
m
e
r
g
es with a
l
te
r
nate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
King
ad
d
tests for
m
er
g
e-i
n
de
x
/ me
r
ge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hama
n
o
"
a
d
d
-p"
:
w
ork-around 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
Jun
i
o
C
Hamano
add--interactive
.
pe
r
l:
f
actor
o
u
t repeated
-
-recou
n
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3701:
Ed
i
t
i
ng a spli
t
hunk
i
n an "add
-
p"
sess
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
ama
n
o
add -p: 'q' s
h
ould rea
l
ly qu
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
a
kub Narebski
gitweb: Mark mat
c
hed
'
c
t
a
g' /
c
ontents tag
(?by_tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jak
u
b Narebsk
i
gitweb: Change
t
he way "
c
o
n
t
e
n
t tags" ('ctags
'
) are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
a
kub Narebski
g
it
w
eb: Restr
u
c
ture projects list
g
eneration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Ham
a
no
Merge b
r
anch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Start
1
.
7
.
5
.
1
ma
i
ntenance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hama
n
o
Me
r
ge
b
r
anch
'
mg/x-y
e
a
rs-12-months
'
int
o
maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git
-
send-email: fix
m
issing space in er
r
or message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Her
l
and
Ma
r
k dir
s
tat e
r
ror messages for
translation
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Im
p
ro
v
e
erro
r
han
d
ling when parsing d
i
rstat parameters
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
New --dirstat
=
line
s
mo
d
e, doing di
r
stat analysis based
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Allow sp
e
c
ifying
--dirstat cu
t
-off percentage
a
s a
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Add c
o
nf
i
g variable for
specifying default --dirs
t
at
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor
-
-
d
irstat parsin
g
; deprecate
--
c
umulative
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Her
l
a
nd
Mak
e
--dirstat
=
0 output directories that contribute
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Ad
d
several test
c
ases for
--dirstat an
d
friends
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
osh S
t
one
blame: tolerat
e
bogu
s
e
-mail addre
s
ses
a bit
b
etter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Mathi
a
s
L
afel
d
t
t/test-li
b
.
sh: minor readability improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
i
m Meyering
diffcore
-
renam
e
.
c: avoid set-but-
n
ot-u
s
ed
warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
J
u
nio C Ham
a
no
Merg
e
branch '
j
c/diff-irreversible-del
e
te'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Hamano
Merge branch 'jc/rename-degra
d
e
-cc-to-c'
commit
|
commitdiff
|
tree
2011-04-28
J
unio
C Ham
a
no
Mer
g
e b
r
anch 'mz/rebase'
commit
|
commitdiff
|
tree
2011-04-28
Jun
i
o C Hamano
Merge branch 'en
/
merge-rec
u
rsive'
commit
|
commitdiff
|
tree
next