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 'jl/submodule-conflicted-gitmodules'
2011-05-20
Ju
n
i
o C Hama
n
o
Merge
b
ranch 'jl/su
b
mo
d
ule-c
o
nflicted
-
gitm
o
dules'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Me
r
g
e
branc
h
'j
c
/re
p
lacing'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Ha
m
a
no
Merge br
a
n
c
h 'nd/sparse-co-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
an
o
M
e
rge branc
h
'ld
/
p4-preserve-user-names'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hama
n
o
Merg
e
branch 'm
s
/tagname-
d
oes-not-begin-with-dash
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Haman
o
Merge bran
c
h 'jk/git
-
conne
c
tion
-
deadlock-fi
x
'
commit
|
commitdiff
|
tree
2011-05-20
J
u
n
i
o C H
a
mano
Merge branch
'js
/
m
a
int-s
e
nd-pack-stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Ham
a
no
M
erge branc
h
'jk
/
cherry-
p
i
c
k-ro
o
t-with-
r
e
solve'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ham
a
no
Merge branch 'jc/main
t
-paths
p
e
c-stdin-and-cm
d
line'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge 1
.
7
.
5
.
2
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
unio
C
Hamano
Reve
r
t "Merge
b
ranch 'en/merge
-
recur
s
ive
'
"
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
J
e
ff
K
i
ng
Makefile: sort TEST
_
PROGRA
M
S list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nieder
provide a copy of
t
he L
G
PLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
t
e
st core
.
gitproxy co
n
figura
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Update release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Ju
n
i
o
C Haman
o
Merge bran
c
h 'j
s
/maint-1
.
6
.
6
-
send-pa
c
k-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/c
o
nvert'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'ci/comm
i
t
-
-interac
t
ive-atomi
c
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
M
er
g
e branch '
s
g/com
p
letion-up
d
at
e
s'
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
H
amano
Merge branch 'kk/maint-prefi
x
-i
n
-c
o
nf
i
g-
m
ak'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
bra
n
ch 'mg/merg
e
-ff-config
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Update
d
raft release notes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o
C Hamano
M
e
rge bra
n
ch 'jn/maint-format-p
a
tch-doc
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
mano
Merge bra
n
ch 'ss/c
h
erry-pick-x-doc'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merg
e
b
r
a
nch 'vr/merge-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
M
e
rge b
r
anch 's
r
/main
t
-fa
s
t-import-tighten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge
branch 'j
c
/
t1506-shell-
p
aram-expansi
o
n-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge br
a
nch 'jc/fix-add-u-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
M
erge branch 'jn/gitweb-dep
e
ndency' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'
j
c/maint-branch-mer
g
e
options' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ha
m
ano
Merge branch
'jc/maint-add-p-overlapping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyerin
g
Documentat
i
on/
g
it-fsck
.
txt:
fix typo: unre
a
dable
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
s
e
nd-
p
ack
:
avoid dead
l
ock on git:
/
/ pu
s
h
w
ith failed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
connect: let
c
a
l
lers k
n
ow if co
n
n
ection is a
s
ock
e
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff
K
i
ng
connect: treat generic prox
y
p
r
o
c
e
s
ses like ssh processes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
sideband_demux(): fix d
e
cl-af
t
er-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
t3503: test c
h
erry picking and reverting root
c
ommits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f King
revert:
all
o
w reverting
a
roo
t
c
ommit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
K
ing
cherry-pic
k
: handle root comm
i
t
s
with ext
e
r
n
al strategi
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Sync r
e
lease note
s
for 1
.
7
.
6 to exclude what a
r
e in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
Merge br
a
nch
'
mai
n
t'
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io
C
H
amano
Upda
t
e dr
a
ft release notes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
branch 'c
n
/fo
r
m
a
t-patch-qui
e
t' int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
Hama
n
o
M
e
r
ge br
a
nch
'
jm/me
r
getool-submodul
e
s' into
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge
branch
'
jk/form
a
t-patch-quote-specia
l
-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
e
r
g
e
branch 'vh/git-svn-
d
oc' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Haman
o
git_open_noatime(): drop unused
p
aramet
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
sha1_file: ty
p
o
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
read_sha1_file(): al
l
ow selective bypassing of
re
p
l
a
cement
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C
Hamano
inline lookup_replac
e
_object() calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
r
ead_sha1_file():
g
et ri
d
o
f read_sh
a
1_file_repl(
)
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
t
6
0
5
0
:
make sure
w
e
t
est not just
c
o
m
mit replacemen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Declare lookup_repla
c
e
_object() in cache
.
h, not in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
Merge
b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add, merge, diff: do not use strcasecmp to c
o
m
pare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
Jens Lehm
a
n
n
Submodules: Do
n
't parse
.
gitmodules wh
e
n it c
o
n
t
ains
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
Heiko Voigt
t
est that git
status works
w
ith
merge conflict in,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Lu
k
e Diamand
git-
p
4: warn if git au
t
horship won't be retained
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Upd
a
t
e draft
r
elease no
t
es
t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
br
a
nch 'bf/commit
-
templat
e
-no-clea
n
u
p'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'j
c
/t1506-shell-pa
r
am-exp
a
nsion-gotcha
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Mer
g
e br
a
nch 'rr/
r
e
rere
-
l
i
bif
y
-clear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
Haman
o
Merge branch 'j
s
/maint-send-pack-sta
t
eles
s
-rpc-dea
d
lo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Me
r
g
e
branch 'jh
/
dirstat-
l
i
n
es'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'
jc/fix-ad
d
-u-unmer
g
ed'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge branc
h
'jn
/
setu
p
-revisions-glo
b
-and-
f
riends-passthru'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
Hamano
Merge branch 'cn
/
log-parse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge branc
h
'ma
i
n
t'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
P
repare
f
or 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ha
m
ano
Merg
e
branch 'a
w
/mai
n
t-
r
eb
a
se-i-
p
-no-ff
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Mer
g
e b
r
anch 'js/blam
e
-par
s
e
na
m
e' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge branc
h
'
g
r
/cvsimport-
a
lternativ
e
-cvs
p
ass-l
o
c
ation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge br
a
n
ch 'cj/p4mer
g
e' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge
b
ranch 'jk/m
e
rg
e
-one-file-working
-
tr
e
e
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-diff-files-
u
nmerged'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch '
m
z/maint
-
r
e
name-unmerged' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
Herland
t5400: F
i
x
a
co
u
ple of
t
ypos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e branc
h
'nd/stru
c
t
-
pathspec'
commit
|
commitdiff
|
tree
2011-05-13
Johannes Sixt
Tweak t3102-ls-tree-wildcards to run on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Haman
o
Merge
branch 'j
c
/
main
t
-1
.
7
.
4-pathspec-stdin-and
-
cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
amano
M
erge branch 'jc/main
t
-1
.
6
.
6-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Ha
m
ano
s
etup_revisions(): tak
e
pathspec from command line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C
Haman
o
Update
draft
r
elease notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
io C Hamano
Merge b
r
anch 'jn/gitweb
-
depe
n
d
e
ncy'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge
b
ranc
h
'j
c
/main
t
-b
r
anch-mergeoption
s
'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Merge branch 'j
n
/maint-
t
est-merge-verify-p
a
rents'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
e
rge bra
n
ch
'
vh/con
f
ig
-
interactiv
e
-
s
inglekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C
Ham
a
no
Merge branch
'
jc/
m
aint-add-p-overlapping-hunks'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o
C Ha
m
ano
Merge
branc
h
's
r
/maint-fast-imp
o
r
t
-tighten-o
p
tion-parsing'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C
H
amano
Mer
g
e br
a
nch
'
dm/h
t
tp-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merg
e
b
r
a
nch 'jn/ctags'
commit
|
commitdiff
|
tree
2011-05-11
Boris Faure
Do not strip em
p
ty lines /
t
railin
g
spaces fr
o
m a commi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio C
H
aman
o
Mer
g
e branch 'fc/co
m
pleti
o
n-zsh' into sg/co
m
pleti
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
J
u
n
io C Hamano
Re
v
ert "completion:
d
on't de
c
lare 'local w
o
r
d
s' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
F
e
l
ip
e
Co
n
treras
g
i
t
-comple
t
i
o
n: f
i
x regression in z
s
h s
u
p
p
ort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conrad
Irwin
T
est atomic git
-
c
ommit
--interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Ngu
y
ễn Thá
i
N
gọc
Duy
sparse
c
he
c
k
out: do not eagerly decide t
h
e fate for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Nguyễn Thái
N
gọc Duy
t1011: fix
s
p
a
rse-checkout initializat
i
on a
n
d add new
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next