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-20
Juni
o
C Hamano
M
e
r
ge
b
r
anch 'jk/cherr
y
-p
i
ck-root-wit
h
-resolve'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C
H
a
m
ano
Merge b
r
a
n
c
h
'jc/maint
-
pa
t
hspec-std
i
n-and-cmd
l
ine'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Mer
g
e 1
.
7
.
5
.
2 in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hama
n
o
Rev
e
rt "Merge
br
a
nch '
e
n/merge-recursive'
"
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jeff K
i
ng
Makefile: sort TEST
_
PROGRA
M
S lis
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jonatha
n
Nied
e
r
pro
v
id
e
a copy of the LGPLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C
H
amano
Updat
e
release notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Ha
m
ano
Merge
br
a
nch 'jc/co
n
vert'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Mer
g
e br
a
nch 'ci
/
commi
t
--interactiv
e
-at
o
m
i
c'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C H
a
mano
M
erge br
a
nc
h
's
g
/c
o
mpletion
-
up
d
at
e
s'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge branch
'
k
k/main
t
-pre
f
ix-in-con
f
ig-m
a
k'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge branch 'mg/merge-ff-config'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Haman
o
Me
r
ge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hama
n
o
Update
d
r
aft rel
e
a
se
notes
to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Me
r
ge b
r
anch '
j
n/maint-format-patch
-
doc' int
o
m
aint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Ha
m
ano
Merge b
r
a
n
ch 'ss/
c
h
e
rry-pi
c
k-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
H
amano
Merge bra
n
ch
'
v
r/me
r
ge-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C H
a
mano
M
erge b
r
anch 'sr/
m
aint-fas
t
-
import-tighten-optio
n
-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/t1506-shel
l
-
p
aram-e
x
pans
i
o
n
-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
M
erge bran
c
h 'jc/fix-add-u-unm
e
rged'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ha
m
ano
Merge branc
h
'jn/gitweb-dependen
c
y' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rg
e
b
ranch 'jc/maint-branch-merge
o
ptions' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erg
e
bran
c
h 'jc/maint-add-p-ov
e
rlapping-
h
unks'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyer
i
ng
D
o
cumenta
t
ion/git-fsc
k
.
t
xt: fix typo: unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
t
3503: test che
r
ry p
i
cking
and re
v
e
rting root com
m
i
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff
K
i
ng
revert: allow reverting a r
o
ot commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
cherry-pick: han
d
le root co
m
mits with externa
l
s
t
r
a
t
eg
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
unio
C
Hamano
Syn
c
release note
s
f
or 1
.
7
.
6 t
o
exclude
what a
r
e in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
U
p
dat
e
d
r
aft release notes to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C
Hamano
Merge
bran
c
h
'
c
n/fo
r
mat-patch-quiet' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Merg
e
branch 'jm/mergetool-submodules' into main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Merge branch 'jk/f
o
r
m
at-pa
t
ch-qu
o
t
e-special-
i
n-f
r
om
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Merge bra
n
c
h
'vh/git-svn-doc'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
git_open_n
o
at
i
me():
d
ro
p
unused parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Haman
o
sha1_file:
t
ypo
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Jonatha
n
Nieder
add, merg
e
, diff: do not us
e
s
t
rc
a
secmp t
o
compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C Ham
a
no
Update draft release notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge bran
c
h
'bf/c
o
mmit-template-no-cleanu
p
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge br
a
nch '
j
c/t150
6
-shell-param-e
x
p
a
ns
i
on-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Me
r
g
e b
r
anch '
r
r/rerere-libify-clear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch 'js/maint-send-pack-stateless-rpc
-
de
a
dlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge branch 'j
h
/dirstat-li
n
es'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
r
a
n
ch 'jc/fix-add-
u
-unmer
g
ed'
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C Hamano
Merge branch 'jn/setup-rev
i
s
ions
-
glob-and-frie
n
ds-p
a
ssthru
'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C
Ha
m
ano
Merge branch 'c
n
/log-pa
r
se-op
t
'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C
H
a
mano
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C
Hamano
Prepa
r
e
fo
r
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch '
a
w
/maint-reba
s
e-i-p-no-ff' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge
b
ra
n
ch 'js/b
l
ame-parsenam
e
' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
M
e
rge branch
'
gr/cvsimport-alte
r
native-c
v
spass-
l
ocation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C
H
amano
Merge bra
n
ch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
anch 'jk/mer
g
e-one-file-working-tr
e
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-diff-files-unm
e
r
ged' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
ma
n
o
Me
r
ge branch 'mz/maint
-
rena
m
e-
u
nmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a
c
ouple of
t
y
p
o
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge branch 'nd/struct-p
a
t
hspec
'
commit
|
commitdiff
|
tree
2011-05-13
Johannes Sixt
T
w
eak t3102-ls-tr
e
e-w
i
ldcards to run
o
n Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merg
e
branch 'jc/ma
i
n
t-
1
.
7
.
4-pathspec-st
d
in
-
and
-
cmdli
n
e'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hama
n
o
Merg
e
branch '
j
c/maint-1
.
6
.
6-pathspe
c
-std
i
n-an
d
-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
setup_revisions(): take pathsp
e
c from command l
i
ne
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Up
d
a
te dra
f
t
release
notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o
C
H
amano
Merge branc
h
'jn/gitweb-d
e
pendency'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merge b
r
a
n
c
h
'jc/main
t
-branch-merge
o
ptions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
Merge branch
'jn/maint-t
e
st-merge-ver
i
fy-pa
r
ents'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
M
e
r
g
e branch 'vh/config-int
e
ractiv
e
-singlekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
no
M
e
r
g
e branch 'jc/maint-add-p-overlappin
g
-hunks'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Ha
m
ano
Merge bra
n
ch
'sr/maint-fas
t
-import
-
ti
g
hten-option-parsing'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hama
n
o
Merg
e
branch 'dm/h
t
t
p
-cl
e
anup'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Mer
g
e bran
c
h 'jn/ctags'
commit
|
commitdiff
|
tree
2011-05-11
Boris
F
au
r
e
Do not strip
empty lines / tra
i
lin
g
spac
e
s
from a commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
Merge bra
n
ch '
f
c
/c
o
mpletion-zsh' into sg/
c
ompleti
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Jun
i
o C Hamano
Reve
r
t "completion: d
o
n't d
e
cla
r
e 'l
o
c
a
l words' t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Feli
p
e Contreras
git-c
o
mpletio
n
: fi
x
re
g
ression
i
n zsh support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Irwin
Test
at
o
mic
git-commit -
-
interactive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Irwin
A
d
d co
m
mit to
list of
c
onfig
.
singlekey co
m
mands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Irwin
Add suppo
r
t f
o
r -p/--patch to git-com
m
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
C
o
nr
a
d
Irwin
Allow git
commit
-
-interactive with paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Jef
f
King
t
7
501
.
8: feed a meaningful
command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Johannes Six
t
Honor $(prefix
)
set in config
.
mak* when defining E
T
C_
G
IT*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C
Hamano
Rever
t
"Hon
o
r $(
p
r
e
f
i
x) set in conf
i
g
.
mak* when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
J
unio C Hamano
convert: ma
k
e it harder to screw up adding a c
o
n
v
ersio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Hamano
convert
:
make it safer to add conversion attributes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Hamano
convert: give san
e
r names to crl
f
/eol variables, typ
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Hamano
convert: rename the
"
e
o
l" global
var
i
able to "co
r
e
_
eol"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t
1
507:
a
void "${
p
ar
a
meter<op>'
w
ord'}" i
n
side double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Jonathan Nieder
completion: move p
r
ivate shopt shim for zsh to
_
_git
_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Ham
a
no
t3701: add-p-fix ma
k
es t
h
e last
t
e
s
t
t
o
pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio
C Ha
m
ano
rerere: libify r
e
rere_clear()
a
nd rer
e
re_gc()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Conrad Irw
i
n
Use a
t
empor
a
ry
index for git co
m
mit --interactive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Remove gitweb/gitweb
.
cgi
a
nd other legacy
t
argets 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
Jakub Nareb
s
k
i
git-instaweb: S
i
mplify 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 Nieder
tests: chec
k
g
i
t
d
oes not bar
f
on
merge
.
ff v
a
lues f
o
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
onathan Nieder
tests: teac
h
verify_
p
are
n
ts to che
c
k for extra par
e
nt
s
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 Ha
m
ano
mer
g
e: intro
d
uce merge
.
ff configuration varia
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Me
r
ge branch 'jc/main
t
-branch-
m
e
r
geoptions' into m
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hama
n
o
merg
e
: make branch
.
<name>
.
mergeoptions co
r
rectly override
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jo
n
a
t
han
Nieder
tests: e
l
imin
a
t
e
unnecessary
setup
t
es
t
a
ssertions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next