repo.or.cz
/
git
/
gitweb.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/maint-config-alias-fix' into maint
2011-06-01
Junio C Hamano
Merg
e
branch 'jk/main
t
-
c
o
n
fig-alias-fix'
into main
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge br
a
nch 'j
c
/fmt-req-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C
Hama
n
o
Me
r
ge branch 'jk/mai
n
t-docs' into maint
commit
|
commitdiff
|
tree
2011-06-01
J
u
nio C Haman
o
M
e
rge branch 'jn/
d
oc-
r
emote-
h
elpers'
into maint
commit
|
commitdiff
|
tree
2011-06-01
Jun
i
o C H
a
ma
n
o
Merge br
a
nch
'kk/maint-p
r
efi
x
-in-config-mak' into
maint
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
Ha
m
ano
Start 1
.
7
.
5
.
4
draf
t
release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
J
u
ni
o
C Hamano
Merge
b
ra
n
ch 'tr/a
d
d-i-n
o
-esca
p
e
'
into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Merge
b
r
anc
h
'vh/config-i
n
t
e
ractive-singl
e
key-
d
oc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
Hamano
M
e
rge branch 'ml/test-readme' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
M
erge
b
ranc
h
'a
b
/i18n-fixup' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ham
a
no
Me
r
g
e
br
a
nch 'jc/re
n
ame-
d
egrade-cc-to-c' int
o
m
a
in
t
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
H
a
m
ano
Merge branch
'
rr/doc-content-type
'
into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C H
a
ma
n
o
Merge branch 'jm/maint-misc-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io C Hamano
Merge branch 'bc/maint-submo
d
ule-fix-parked' into
m
aint
commit
|
commitdiff
|
tree
2011-05-30
Junio C
H
amano
Me
r
ge branch
'
b
c/maint-api
-
doc-parked
'
into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
M
e
r
g
e
bra
n
c
h
'jn/
r
un
-
c
ommand-error-failure' into
m
aint
commit
|
commitdiff
|
tree
2011-05-27
Junio C Hamano
con
f
ig
.
mak
.
in: allow "co
n
figure --
s
yscon
f
di
r
=/else
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Git
1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C Hamano
Mer
g
e branc
h
'maint-1
.
7
.
4
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Me
r
g
e
b
ranch
'
jk/git-con
n
ection-d
e
ad
l
ock-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Me
r
ge
b
ranch '
j
s/
m
aint-send-pack-stat
e
less-
r
pc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
i
o C Haman
o
Merg
e
branch 'jk
/
maint-upload-pack-shallow' into maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
i
o C H
a
mano
Merge
b
ranch
'
jm/main
t
-
diff-words-with
-
sbe' into maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C H
a
m
a
no
M
e
rge branch 'kk
/
maint-
p
refix-
i
n-config-mak' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge br
a
nch 'm
g
/diff-uic
o
nfig-doc
'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge b
r
anch 'ft/g
i
tw
e
b
-tar-
w
i
t
h
-
gzip-n
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io
C
Hamano
Merg
e
b
r
a
n
ch 'ss/doc-sv
n
' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jn/fo
r
mat-patch-doc' into m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merg
e
b
ranc
h
'jc/maint
-
pathspec-stdin-and-cmdl
i
ne'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
M
e
rge
b
r
a
nch 'j
k
/
che
r
ry-pick-roo
t
-with
-
r
esolve' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
M
erge branch 'rg/c
o
py-gecos-use
r
name
'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hama
n
o
Merge branch 'fc/completion-
z
sh' into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
er
g
e branch 'jk/git-connection-deadlock-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merge br
a
nch 'js/maint-send-pac
k
-stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
m
a
n
o
M
e
rge branch 'svn-
f
e-m
a
int' of git://repo
.
or
.
c
z
/
git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
J
u
nio
C Hamano
userf
o
rm
a
t_find_req
u
irements
(
): fin
d
require
m
ent for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Ju
n
i
o
C Hamano
handle_options(): do not
m
iscount
h
ow many arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
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-17
Junio C Hamano
Mer
g
e
b
ranch 'j
s
/maint
-
1
.
6
.
6
-
send-
p
ac
k
-sta
t
eles
s
-
r
pc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hama
n
o
U
p
d
a
te d
r
aft release note
s
to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
Ham
a
n
o
Merge
b
ranch
'
j
n/m
a
int-fo
r
mat-
p
atch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
Hamano
Merge
b
r
anch 'ss/cherry-pick-
x
-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ham
a
n
o
Merg
e
branch
'
vr/merge-base-doc'
i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'sr/m
a
int-
f
ast
-
import-tig
h
t
en-option-p
a
rs
i
ng
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge branch 'jc/
t
1506-
s
h
ell-p
a
ram-
e
x
pansion
-
gotc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C Hamano
Merge branc
h
'
j
c/
f
ix-add-u-u
n
mer
g
ed' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge branch 'jn
/
gitw
e
b-depend
e
n
cy' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Mer
g
e b
r
anch 'jc/maint-branch-mergeoptions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
man
o
Merge br
a
nch
'jc/maint-ad
d
-p-ove
r
lapping-hunks'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
sideb
a
n
d_dem
u
x(
)
: fix decl
-
a
fter-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Update draft re
l
e
ase notes
t
o 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Merg
e
br
a
n
c
h 'c
n
/format-patch-quiet' into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge
b
r
anch 'jm/mergetool-submodules' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C H
a
mano
Merge
branch
'
jk
/
format-patch-quote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
am
a
no
M
erge branc
h
'vh/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_open_noat
i
me(): d
r
op
unuse
d
param
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_file: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
a
n
o
P
r
epare for
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge br
a
nch 'aw/maint-reb
a
se-i-p
-
no-ff
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge branch 'js/
b
lame-parsename
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C
H
amano
Merge branch 'g
r
/
c
vsim
p
ort-alte
r
native-cvsp
a
ss-loc
a
ti
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C Hamano
Merge
branch
'
jk/merge-one-file-wo
r
king-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merg
e
bran
c
h 'jc/fix-
d
iff-files-unm
e
r
g
e
d
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge branch 'mz/maint-rename-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merg
e
b
r
anch 'jc/maint-1
.
7
.
4-p
a
thspec-stdin-and
-
cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Ha
m
a
no
Merge bra
n
ch 'jc/maint-1
.
6
.
6-pathspec-stdin
-
and-cm
d
line'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
setup_revisi
o
ns(): take p
a
thspec
from command
line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Haman
o
R
e
vert "Hon
o
r $(p
r
efi
x
) set
i
n
config
.
mak*
w
hen defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C H
a
ma
n
o
t15
0
7: avo
i
d "${parame
t
e
r<op>'word'}" insi
d
e double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701: add-p-f
i
x makes the
last
t
est
t
o pa
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C Hamano
merge: mak
e
branch
.
<name>
.
mergeoptions correc
t
l
y
o
v
e
rride
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io C H
a
mano
Merge b
r
anch 'js/maint-1
.
6
.
6-send
-
p
a
ck-stateless-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hama
n
o
t
3701: fi
x
here do
c
umen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
unio 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
Merge
b
ranch
'
jh/dirstat' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
Hamano
Mer
g
e branch
'sp/m
a
int-clear-postf
i
elds' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge branc
h
'jk/maint-st
a
sh
-
oob'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch
'
jk/maint
-
upload-pack-s
h
all
o
w' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
M
e
r
g
e branch
'dm/stash-k-i-p' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Ha
m
ano
M
erge b
r
anc
h
'jc/pack-obj
e
cts-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
branch 'm
g
/refl
o
g-with
-
op
t
ions' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge b
r
anc
h
'jk/s
t
ash-l
o
o
s
e
n-safety' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge branch 'ar/clean-rmdir-empty' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge b
r
anch 'mg/sha1-path-advise' into
m
aint
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
"add
-
p": w
o
rk-aroun
d
an old lazin
e
ss
t
ha
t
does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
a
d
d
-
-intera
c
tive
.
perl: fact
o
r
out repeated
-
-recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
t370
1
: Editing
a
spli
t
h
unk in an "add
-
p" sessio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add -p:
'q' should re
a
l
ly quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
Start
1
.
7
.
5
.
1 ma
i
n
tenance trac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C
H
ama
n
o
Merge branch 'mg/x-year
s
-
1
2-mont
h
s' i
n
t
o
main
t
commit
|
commitdiff
|
tree
2011-04-26
J
u
nio
C
Hamano
http: clear POST
F
IELDS when init
i
alizing
a
s
lot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
J
u
n
i
o
C Hamano
Me
r
ge bran
c
h
'js/maint-1
.
6
.
6-send-pack-stateless-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fix "
a
dd -
u
" that some
t
ime
s
f
ails to resolve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
diff-files: show unmer
g
e
d
entries correct
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C
H
a
man
o
diff:
remove o
f
t
e
n
unuse
d
pa
r
a
m
eters
from diff_unm
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hamano
diff
.
c: ret
u
rn
f
ilepai
r
f
r
om diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o
C Hamano
test:
use $_z40 from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
Hama
n
o
G
i
t
1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next