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 'tr/maint-word-diff-regex-sticky' into maint
2012-04-26
J
u
nio C Hamano
Merge b
r
a
nch 'tr/m
a
int-word-d
i
ff-regex-
s
ticky' into
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hamano
Merge branch 'jh/notes-merge-i
n
-g
i
t-dir-worktree' into
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
ano
S
y
nc
w
i
t
h 1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
io 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
S
y
nc with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
a
m
ano
G
i
t 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C Hama
n
o
Sync
w
i
t
h 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Git
1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jonathan Nied
e
r
bu
n
dle: remove
s
tra
y
single-q
u
ot
e
fr
o
m 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
Junio C Hamano
Me
r
ge b
r
anch 'main
t
-1
.
7
.
9' into maint
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
Merge branc
h
'
m
aint-1
.
7
.
8'
into maint-
1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-10
René Scharfe
tes
t
-subp
r
ocess: fi
x
segfault w
i
thout
a
rguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
René Scharfe
s
u
bmodule
:
fix prototype of gi
t
modules_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hamano
M
e
rge branch 'jc/
m
aint-v
e
rify-objects-remove-pessi
m
ism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C Hamano
Mer
g
e branch
'
dw/gitweb-d
o
c-grammo'
into
m
ain
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branc
h
't
r
/cache-tree' into
m
a
int-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C H
a
mano
Merg
e
bra
n
ch 'cb/m
a
int
-
t554
1
-make-server-port-p
o
rtable
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
M
e
rge branch 'cn
/
maint-rev-list-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C Ham
a
no
Merge
b
ranch 't
r
/maint-b
u
ndle-bou
n
dary' int
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Me
r
ge branch 'tr/maint-bundle-long-subject' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Hamano
M
e
rg
e
branch '
p
h/rerere-doc'
into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
Jun
i
o C Ham
a
no
Git
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-06
Felipe Contreras
spec: add m
i
ssing
b
uild dependency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
Ju
n
io C Ha
m
a
n
o
Git 1
.
7
.
10-rc
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Ha
m
ano
Merge branch 'pt
/
g
itk'
commit
|
commitdiff
|
tree
2012-04-02
Junio C
H
am
a
no
Sync with 1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Juni
o
C
H
amano
Merge branch 'jc
/
m
a
in
t
-merge-
a
utoedit' into main
t
commit
|
commitdiff
|
tree
2012-04-02
Pat Thoyts
gitk: fix setting font display
w
i
th new tabbed dialog
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Pat Thoyt
s
gitk: fix t
a
b
bed preferen
c
es co
n
struction when using
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Merge gi
t
://github
.
com/git
-
l10n/git-po
commit
|
commitdiff
|
tree
2012-03-31
J
u
nio C Hamano
M
erg
e
br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2012-03-30
Heik
o
Voigt
string
-
list: docum
e
n
t that string_lis
t
_insert
(
)
inse
r
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
R
e
n
é
S
c
h
a
rfe
confi
g
: rem
o
v
e
useless assignment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Junio C Hamano
Git 1
.
7
.
10-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim Me
y
ering
corre
c
t a few d
o
ubled-wor
d
nits i
n
comments and docu
m
en
t
at
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim Meyeri
n
g
c
o
rrect spelling: an
URL -> a URL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
Jun
i
o
C Hamano
l1
0
n
updates for Git 1
.
7
.
10
-
rc1
commit
|
commitdiff
|
tree
2012-03-27
Zbigniew Jędrzejewsk
.
.
.
te
s
ts: unset COLU
M
NS i
n
herited f
r
om envir
o
nmen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
U
p
dat
e
d
r
aft
r
elease notes to 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Sync with 1
.
7
.
9
.
5
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hama
n
o
Gi
t
1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Merge branch 'jn/maint-fast-impo
r
t-empty-ls' into maint
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
Hama
n
o
Merge branch
'
ph/re
r
ere-doc' into m
a
int
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io
C Hamano
Merge bra
n
ch 'ms/maint-confi
g
-error-at-e
o
l-linecou
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark Lod
a
t
o
grep doc:
a
dd --break / --headin
g
/
-
W
to
s
ynopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rodrig
o
Silva (Mest
r
.
.
.
Documen
t
a
tion
:
improve descript
i
on
o
f GIT_EDITO
R
a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
N
elson Ben
i
t
e
z Leon
documentation: f
i
x alpha
b
etic o
r
d
ered list for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-24
Junio C H
a
m
ano
Merge gitk chang
e
s from Paul
Mackerras at git://ozlabs
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
J
u
nio C Hamano
Git 1
.
7
.
10-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Junio C Haman
o
.
mailmap
:
unify v
a
rious old
mail add
r
ess
e
s of gitster
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
Merge b
r
a
n
c
h
'am/compl
e
tion-zsh-fix'
commit
|
commitdiff
|
tree
2012-03-23
Juni
o
C Hamano
Mer
g
e
branch 'dw/gitweb-d
o
c-gr
a
mmo'
commit
|
commitdiff
|
tree
2012-03-23
D Waitzman
D
oc
u
mentation
/
gi
t
web: trivial English fixes
commit
|
commitdiff
|
tree
2012-03-21
Alex Merry
co
n
tri
b
/completion: "l
o
c
a
l v
a
r=()" is misi
n
ter
p
reted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hama
n
o
Merg
e
branc
h
'
main
t
'
commit
|
commitdiff
|
tree
2012-03-20
Junio C
H
amano
Merge b
r
anch 'mai
n
t-1
.
7
.
8' int
o
maint
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
m
e
r
ge: b
a
ckport
G
IT_
M
ERGE_AUTO
E
DI
T
support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Hamano
Merge branch 'ks/so
r
t
-
w
ildcard-in-m
a
ke
f
i
le' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C Hamano
Merge branc
h
'
jc
/
a
d
v
is
e
-i18n' into maint
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
J
u
n
i
o C
Hamano
M
erg
e
branch 'jn/gi
t
web-unsp
e
cified-ac
t
ion' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hama
n
o
Merge branch 'ab/perl-i18n'
commit
|
commitdiff
|
tree
2012-03-16
Ævar Arnfjörð Bja
r
mason
perl/Makefile: install
G
it::I18N
u
nder NO_
P
ERL_MAKEMAKER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
U
pdate dr
a
ft release
n
ote
s
to 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Junio C
H
amano
Me
r
ge b
r
a
n
ch '
t
h/mergetools-delta
w
a
lk
e
r
'
commit
|
commitdiff
|
tree
2012-03-16
Junio C
Hamano
M
e
rge branch 'jc
/
maint
-
v
e
r
ify-obj
e
cts-remo
v
e-pessimis
m
'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
M
erge branch 'sl/
c
us
t
omize-sane-to
o
l
-path'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hama
n
o
Merge "
t
wo fixe
s
f
o
r fast-import's 'ls' command"
f
rom
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio C H
a
mano
Merge br
a
nc
h
'th/
g
it-dif
f
all'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merg
e
branch 'th/doc-diff-submodule-option'
commit
|
commitdiff
|
tree
2012-03-15
Junio C Hamano
fetch/rece
i
ve: remove over-pessimistic connectivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
T
im Henigan
Documen
t
ation/dif
f
tool:
a
dd deltawa
l
ker t
o
list of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an Herland
n
otes-merge
:
Don't remove
.
git/NOTES_MERGE_
W
ORKTREE
.
.
.
Inspired-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
J
oha
n
He
r
land
notes-merge: use opendir/read
d
ir instead of us
i
ng read_direc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han He
r
la
n
d
t
3
310: illustr
a
te fai
l
u
re to "notes merge --commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Jun
i
o C Hamano
remove
_
d
i
r
_recursive
l
y(): Add flag for skipping
r
e
moval
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Ju
n
io
C
Hamano
Git 1
.
7
.
10-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
contr
i
b/diffall: fix
c
leanu
p
trap
on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Ti
m
Henigan
contrib/diffall: elimin
a
te duplicat
e
while
l
o
ops
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim H
e
nigan
contrib/diffall: eliminate use o
f
tar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
contrib/diffall: create tm
p
dirs without mktemp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
T
i
m Henigan
con
t
ri
b
/diff
a
ll:
comment
actual reason
f
or 'cdup'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Thomas
Ras
t
diff:
t
weak
a
_copy_ of diff_optio
n
s with wo
r
d-diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Thomas Rast
diff: refactor the word-diff setup
from builtin_dif
f
_cmd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Johannes Sixt
t4034
:
d
i
ff
.
*
.
wordregex sh
o
uld not be "s
t
ic
k
y" in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
Documentat
i
on/di
f
f-op
t
ions: reword description of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hamano
Merge branch
'
jc/i18n-shell
-
scr
i
pt-gettext'
commit
|
commitdiff
|
tree
2012-03-13
Junio C
Hamano
M
e
rg
e
branch 'jc/m
a
in
t
-und
e
fine
d
-i18n-ob
s
ervati
o
n-test'
commit
|
commitdiff
|
tree
2012-03-13
Junio C
Hamano
Merge b
r
an
c
h 'ms/maint-config-error-at-eo
l
-linec
o
unt'
commit
|
commitdiff
|
tree
2012-03-13
J
unio C H
a
mano
Merge branch 'ph/rerere-doc'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hamano
am: officially dep
r
e
cate -b
/
--binary option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Update draft release
notes to 1
.
7
.
10 bef
o
re -r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
u
nio C
Hamano
M
e
rge branch 'az/v
e
r
ify
-
tag-us
e
-gpg-config'
commit
|
commitdiff
|
tree
2012-03-12
Junio C
Hamano
Sync with 1
.
7
.
9
.
4
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Git 1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge branch 't
r
/maint-bundl
e
-boundary' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-03-12
Junio C
H
amano
Merge
branch 'j
c
/maint-diff-
p
at
c
h-header' into main
t
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
J
unio C
H
amano
Merge branch 'jn/maint-d
o
-not
-
match-with-
u
nsaniti
z
ed
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
io C Hama
n
o
Merge branch 'jc/am-3-nonstandard-popt' in
t
o maint
commit
|
commitdiff
|
tree
2012-03-12
Tho
m
a
s
Rast
g
it-am
:
error
out w
h
e
n seei
n
g -b/--binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next