repo.or.cz
/
git
/
jrn.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/rebase-i-submodule-conflict-only' into maint
2012-05-02
Jun
i
o C
Hamano
Merg
e
b
ranch 'jk/re
b
ase-i-submodule-confl
i
ct-only'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o
C Haman
o
Mer
g
e br
a
nch 'maint' of https://github
.
c
o
m/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C H
a
mano
Start preparing
for 1
.
7
.
10
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
M
e
rge branch 'jk/r
u
n-com
m
a
nd-eacces' into
m
aint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
n
o
Merge
b
ranch 'jc/push-u
p
str
e
a
m
-
s
anity' into
maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
Merge
b
r
a
n
c
h '
j
c/maint-cl
e
an-nested-worktree-in-subdir
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ham
a
no
M
erg
e
bra
n
ch 'jk/diff-no-rename-empty'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Ha
m
an
o
Merge branch 'rs/combin
e
-
diff-z
e
ro-c
o
n
text-at-the
-
beginning
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Hamano
Mer
g
e bran
c
h 'jc/commit-unedited-template' into ma
i
nt
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hamano
Merge branch
'jk/add-
p
-
skip-conf
l
icts' into
m
a
int
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Ham
a
no
M
e
rge branch
'jc/commit-hook-authorship'
i
n
t
o maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Mer
g
e
b
r
anch
'tr/m
a
int-word-diff-regex-sticky'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hamano
M
e
rge bra
n
ch 'jh/notes-merge-in-git-
d
ir-worktre
e
'
into
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Sync with 1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hamano
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio
C
Hamano
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C Hamano
Sy
n
c with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
i
o C
H
am
a
n
o
Gi
t
1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jon
a
than Nieder
bundle: remove stray single-qu
o
te from error message
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
J
u
nio C Hamano
Merge branch 'main
t
-1
.
7
.
9' into mai
n
t
commit
|
commitdiff
|
tree
2012-04-10
Junio
C
Hamano
Merge b
r
anch 'maint-1
.
7
.
8' in
t
o maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-10
René Schar
f
e
test-subprocess: fix se
g
fau
l
t witho
u
t arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
René S
c
harfe
submodule:
fix prot
o
type of gitmod
u
les_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
re
b
ase -i
c
o
ntinue: d
o
n't skip
commits that only chang
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Hamano
M
erge branch 'jc/mai
n
t-v
e
rify-object
s
-remove-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
Merge bra
n
ch 'd
w
/gitweb-d
o
c-
g
r
ammo' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
uni
o
C H
a
m
an
o
Merge bra
n
ch 'tr/cache-tree' into
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C Hama
n
o
Mer
g
e
branch '
c
b
/
maint-t554
1
-
m
ak
e
-serv
e
r-
p
ort-po
r
table
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o
C
Hamano
Merg
e
bran
c
h 'cn/maint-re
v
-li
s
t-doc' into
m
aint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
Mer
g
e bran
c
h
't
r
/maint-bundle-boundar
y
' into main
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Ha
m
ano
M
e
rge branch
'tr/maint-bundle-long-subj
e
ct' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge b
r
anch 'ph/
r
e
r
e
re-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
Junio
C Hamano
Git 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-06
Felipe Contr
e
ras
spec: add missing build dependen
c
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Jeff King
run-com
m
a
n
d: treat inacc
e
ssib
l
e dire
c
tories as ENOENT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Ramsay Jone
s
compat/mingw
.
[c
h
]
: Change return
t
ype of exe
c
functions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
J
u
nio C Hamano
push:
e
r
r
o
r
out when the "upstream" s
e
mantics do
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Jeff King
a
d
d--interactive:
i
gnore unmerged entr
i
es in patc
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
Ju
n
io C Haman
o
Documentation
/
git-comm
i
t: rephras
e
the "initial-ness
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
J
unio C
H
amano
Git 1
.
7
.
10-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
J
u
nio C Hamano
Merge branch 'pt/gitk
'
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Sync wi
t
h 1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
Juni
o
C
H
a
m
ano
Git
1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
J
u
nio C Hamano
Merge branch 'jc/maint-merge-au
t
oedit' into
maint
commit
|
commitdiff
|
tree
2012-04-02
Pat Thoyts
gitk: fix settin
g
font
displ
a
y with
new tabb
e
d dialog
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Pat
Thoyts
g
i
t
k:
fix t
a
bbed prefere
n
ces c
o
nstruction when usi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Merge git://
g
i
t
h
u
b
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-04-01
Adam Monsen
git-co
m
mit
.
t
x
t
: clarify -t r
e
quir
e
s editing message
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-31
Junio C Hamano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2012-03-30
Ju
n
io C Hamano
commit: re
p
hra
s
e the
error w
h
e
n u
s
er did not t
o
uch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Ju
n
i
o C
Hamano
co
m
mi
t
: do no
t
trigger
bogu
s
"
has
templat
e
d mess
a
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
J
u
nio C Haman
o
t7501:
test
the right kind
o
f breakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Heiko Vo
i
gt
string-list
:
document th
a
t string_lis
t
_
i
nsert(
)
inserts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
R
ené Scharf
e
confi
g
: remove
u
seless assignment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jun
i
o C
Hamano
G
it 1
.
7
.
10-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim Meyeri
n
g
correct a few doubled-w
o
rd nits in comments
and documentat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim Meyering
correc
t
spelling:
an U
R
L ->
a URL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
Jun
i
o
C Hamano
l
1
0n updates for Git 1
.
7
.
10
-
rc1
commit
|
commitdiff
|
tree
2012-03-27
Zbigniew Jędrze
j
e
w
sk
.
.
.
t
ests: unset COLUMNS inherit
e
d from e
n
vironment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
Hamano
Update
d
raft rel
e
ase
n
otes to 1
.
7
.
1
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
J
u
n
i
o
C Hamano
Sync with
1
.
7
.
9
.
5
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Git 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Jun
i
o C Haman
o
Merge
b
ranch 'jn/m
a
int-fast-im
p
ort
-
empt
y
-ls' into m
a
int
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hama
n
o
Merge branch 'ph/rerere-do
c
' int
o
main
t
commit
|
commitdiff
|
tree
2012-03-26
J
unio C Hamano
Merge branch
'ms/main
t
-confi
g
-error-at-eol-lineco
u
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark Lodato
g
rep doc: add --bre
a
k
/ --heading
/ -W to syno
p
sis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
R
odrigo Silva (M
e
str
.
.
.
Documentation: improve descripti
o
n of
GIT_EDITOR and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Nelson Benitez Le
o
n
documentation: fix
a
lphabet
i
c
ordered list for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
René Scha
r
fe
co
m
bin
e
-
d
iff: f
i
x loop index underflow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-24
Junio C Hamano
Me
r
ge gitk changes
from Paul
Mackerr
a
s at git:
/
/ozlabs
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hama
n
o
G
i
t 1
.
7
.
10-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
J
u
n
i
o
C Hamano
.
m
a
i
l
map: unify various o
l
d mail ad
d
res
s
es of
g
itster
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
J
u
nio C Ha
m
an
o
Merge br
a
nch '
a
m/completio
n
-zsh
-
fix'
commit
|
commitdiff
|
tree
2012-03-23
Jun
i
o C Hama
n
o
Merge branch
'
dw/gitw
e
b-doc-gramm
o
'
commit
|
commitdiff
|
tree
2012-03-23
J
e
ff King
merge-
r
ecursive
:
don't dete
c
t rena
m
es of em
p
ty f
i
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Jeff K
i
ng
t
e
ac
h
d
i
f
fcore-re
n
a
me to optionally
ignore em
p
ty
c
ont
e
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Jeff King
ma
k
e is
_
empty_blo
b
_
sha1 availabl
e
everywhere
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Jeff King
drop casts from users EMPTY_TREE
_
SHA1_BI
N
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
D Waitzman
Docume
n
tation/g
i
tweb:
t
rivial
English fixes
commit
|
commitdiff
|
tree
2012-03-21
Alex
Me
r
ry
contrib/completion: "local var=()" is misinterpre
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branch 'mai
n
t
-
1
.
7
.
8'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-20
Junio C
Hamano
merge: back
p
o
r
t
GI
T
_MERGE_AUTOEDIT su
p
port
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Jun
i
o C Hamano
Merge branch
'ks/sort-wildcard-in-
m
a
k
efile' into m
a
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C
H
a
m
ano
Merg
e
branch '
j
c/advise-i18n' in
t
o
main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C H
a
ma
n
o
M
e
rge branch 'jn/gitweb-unspecified-action'
into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Jun
i
o C
H
a
mano
Merge br
a
nch 'ab
/
pe
r
l-i18n'
commit
|
commitdiff
|
tree
2012-03-16
Ævar Arnfjörð Bjarmason
per
l
/Makefile
:
install G
i
t::
I
1
8
N under NO_PERL_MAK
E
MAKER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Up
d
ate draft release notes
t
o 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Ju
n
io C Hamano
Merge branch 'th
/
me
r
getools-deltawa
l
ker'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
M
e
rge branch 'jc/maint-v
e
rify-o
b
jects-remove-pessimism'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge b
r
anch
'
sl/customiz
e
-sane-tool-path'
commit
|
commitdiff
|
tree
2012-03-16
Juni
o
C Hamano
Merg
e
"two
f
ixes for f
a
st-imp
o
rt's '
l
s' command" from
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio C
Hama
n
o
Merge branch 'th/git-diffal
l
'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge branch 'th
/
d
o
c-diff-sub
m
odule-optio
n
'
commit
|
commitdiff
|
tree
2012-03-15
Junio C Hamano
fetch
/
receive: remove over-pe
s
sim
i
stic connectivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Tim Henigan
Document
a
ti
o
n/difftool: add
d
eltawal
k
er to
list of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Juni
o
C Ham
a
no
cle
a
n: preserve nested git workt
r
ee in subdirecto
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han
Her
l
and
notes-merg
e
: Don't remove
.
git/NOTES_MERGE
_
WO
R
KTREE
.
.
.
Inspired-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next