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 'rs/combine-diff-zero-context-at-the-beginning' into maint
2012-04-26
J
u
nio C
H
am
a
n
o
Merge b
r
anch '
r
s/com
b
ine-diff-zero-co
n
text-at
-
the-
b
e
g
inning
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
io C H
a
mano
Me
r
ge branch '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
M
e
rge branc
h
'j
k
/add-p
-
skip-conflicts'
i
nto maint
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Haman
o
M
e
rge branch
'
jc/co
m
mit-ho
o
k-authorship' into main
t
commit
|
commitdiff
|
tree
2012-04-26
Junio C Ha
m
ano
Merge
b
r
a
nch 'tr/
m
a
i
n
t
-word-di
f
f-regex-sticky' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
uni
o
C
Hamano
Merge br
a
nch
'jh/notes-merge-in-g
i
t
-
d
ir-worktree' into
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hamano
S
ync with
1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Hamano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
io C
H
a
mano
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Junio C Haman
o
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
H
ama
n
o
Sync
with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Gi
t
1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Jonathan N
i
eder
bun
d
le: remove stray single-quo
t
e
f
r
om
e
rror m
e
ssage
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
J
unio C
H
a
m
ano
Merge branch 'ma
i
n
t-1
.
7
.
9' into maint
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
M
erge b
r
anch 'maint-1
.
7
.
8' into maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-10
René Scharfe
test-subproc
e
ss: fix se
g
fault
witho
u
t arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
René Sc
h
arf
e
submodule: fix pro
t
otyp
e
of git
m
od
u
l
e
s_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
J
unio C H
a
mano
Merge branch '
j
c
/
maint-ver
i
fy-objec
t
s-remove-pe
s
s
i
mism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
u
n
io C Hamano
Merge b
r
an
c
h 'dw/
g
itweb-doc-gr
a
mmo'
i
n
t
o maint
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o C Ha
m
ano
M
erge branch 'tr/cach
e
-
t
ree'
in
t
o maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge b
r
anch '
c
b/maint-
t
55
4
1-make-server-port-por
t
able
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge bran
c
h 'cn
/
m
a
i
nt-
r
ev-list-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
unio C Hamano
Merge b
r
anch 'tr/mai
n
t-bundle-
b
oundary' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C
H
amano
Merge bra
n
ch
'tr/maint-bund
l
e-long-s
u
bject' i
n
to
m
aint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
M
erge bra
n
ch 'ph
/
r
er
e
re-doc' into main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
Jun
i
o
C
Hamano
Git 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-06
F
elipe Contreras
spec: add missi
n
g build dependency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Jeff Kin
g
add--
i
nteractive: ignore un
m
erged entries in patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
Junio C Hamano
Documen
t
ation/gi
t
-
co
m
mi
t
: rephrase the "ini
t
ial-ness
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
J
u
nio C
Hamano
G
i
t 1
.
7
.
10-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio
C
Hamano
Merge
b
ranch '
p
t/
g
itk'
commit
|
commitdiff
|
tree
2012-04-02
Junio C
H
aman
o
Sy
n
c with
1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
Junio C Ha
m
an
o
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
J
unio C
H
a
m
ano
Merge branch '
j
c/maint-merge-aut
o
edit'
i
nto maint
commit
|
commitdiff
|
tree
2012-04-02
P
at Thoyts
gitk: fix set
t
ing font
display
w
ith new
tabbed dial
o
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Pat Thoyts
gitk: fix tabbed preferences constr
u
ction when
u
s
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Juni
o
C Hamano
Merge git://github
.
c
o
m/git-
l
10n/git-po
commit
|
commitdiff
|
tree
2012-04-01
Adam Monsen
git-co
m
mit
.
txt: clari
f
y -t r
e
quires ed
i
ting messag
e
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
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2012-03-30
Ju
n
io C
Ha
m
ano
commit: rephra
s
e
the er
r
or when user di
d
not
t
o
u
ch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Juni
o
C
Hamano
com
m
it:
d
o not tri
g
g
e
r bogus "has templated mes
s
age
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Junio C Hamano
t7501:
t
est the right
k
ind of
breakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Hei
k
o Voigt
string-li
s
t:
docume
n
t tha
t
stri
n
g
_
lis
t
_insert() insert
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
René
S
charfe
c
o
n
fig: remove useless assig
n
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
J
u
nio C Hamano
Git
1
.
7
.
10-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim Meye
r
ing
cor
r
ect a
f
e
w do
u
bled
-
word nits in comments
a
n
d documen
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
J
im Meyer
i
ng
correc
t
s
p
e
lling: a
n
URL -> a URL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
Ju
n
io C Haman
o
l10n updates
for Git 1
.
7
.
1
0-r
c
1
commit
|
commitdiff
|
tree
2012-03-27
Z
b
igniew
Jędrzejewsk
.
.
.
tes
t
s: un
s
et COLUMNS inher
i
ted from environment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
Haman
o
U
p
d
ate draft release
n
o
tes to
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C
Hamano
Sync
w
i
th 1
.
7
.
9
.
5
commit
|
commitdiff
|
tree
2012-03-26
Jun
i
o C Hamano
Git 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Merge
b
ran
c
h 'jn/maint-fas
t
-import-empty-ls' into
maint
commit
|
commitdiff
|
tree
2012-03-26
J
u
ni
o
C Hamano
M
e
rge br
a
nc
h
'ph/rerere-doc' int
o
maint
commit
|
commitdiff
|
tree
2012-03-26
Jun
i
o C Hamano
Me
r
g
e
branc
h
'ms/
m
aint-con
f
ig-error-at-e
o
l-lineco
u
nt
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark L
o
d
a
to
grep doc: add --bre
a
k / --heading / -W
t
o synopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo Silva
(Mes
t
r
.
.
.
Documenta
t
i
on
:
i
mprove desc
r
iption
o
f GIT_EDITOR and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Nelson Benitez Leon
do
c
umentatio
n
:
fix alpha
b
etic
ordere
d
list
for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
René Scharf
e
c
ombine-diff: fix l
o
op index underflow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-24
Junio C
Hama
n
o
Merge gitk ch
a
n
ges from Paul Mackerras at git://ozlabs
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
Junio C Ha
m
an
o
G
i
t 1
.
7
.
10-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Junio C Ham
a
no
.
mailmap: unify
various old mail
a
ddres
s
es
of gitster
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Junio C Haman
o
Merge
b
r
an
c
h 'am/completion-zsh-fix
'
commit
|
commitdiff
|
tree
2012-03-23
Junio C
Ha
m
ano
M
e
r
ge bran
c
h 'dw/gitweb-doc-grammo'
commit
|
commitdiff
|
tree
2012-03-23
D Waitz
m
an
Do
c
umentation/
g
i
t
web: t
r
ivial
E
nglish fixes
commit
|
commitdiff
|
tree
2012-03-21
Alex
M
erry
contrib/completio
n
: "local var=()" is misinter
p
reted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C
H
amano
M
e
r
ge b
r
anc
h
'm
a
int'
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Hamano
Mer
g
e bran
c
h
'maint-1
.
7
.
8'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-20
Junio C
H
amano
merge: bac
k
port GIT_M
E
RGE_AUTOEDIT supp
o
rt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
J
unio C H
a
mano
Merge b
r
anc
h
'ks/
s
ort-wildca
r
d-in-ma
k
e
file'
into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
J
unio C Hama
n
o
M
erge branch 'jc
/
advise-i18n' into main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branch 'jn/gitweb-uns
p
eci
f
i
e
d-a
c
t
i
on'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
J
u
ni
o
C Ham
a
n
o
Merge branch
'ab/perl
-
i18n'
commit
|
commitdiff
|
tree
2012-03-16
Ævar Arnfjörð Bjarmason
perl/Makef
i
le: in
s
tall Git::I18N under
N
O_PE
R
L_MAKEMAKER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Ju
n
io C Ha
m
ano
Upda
t
e
d
raf
t
re
l
e
ase no
t
es to
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Jun
i
o
C Ha
m
ano
Merge
br
a
nch 'th
/
mergetools-de
l
ta
w
alk
e
r'
commit
|
commitdiff
|
tree
2012-03-16
Jun
i
o C Hamano
M
erge branch 'jc/
m
ain
t
-verify-
o
bjec
t
s
-
rem
o
ve-pessi
m
ism'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Me
r
g
e bra
n
ch 'sl/customize-sane-too
l
-path'
commit
|
commitdiff
|
tree
2012-03-16
J
u
n
io C Hamano
Merge "two
fixes f
o
r
fa
s
t-imp
o
r
t
's 'ls' comma
n
d" from
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio
C Ha
m
a
no
M
erge branch 'th/git-diff
a
ll'
commit
|
commitdiff
|
tree
2012-03-16
Junio
C Ham
a
no
Merge
branch 't
h
/doc-dif
f
-submodule-option'
commit
|
commitdiff
|
tree
2012-03-15
Junio
C
Haman
o
fet
c
h/receiv
e
: remove over-p
e
ssim
i
s
t
i
c
connectivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Tim
H
enigan
Documentation
/
d
i
f
f
tool: add
de
l
tawalker t
o
l
ist of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes
-
merge: Don't r
e
mo
v
e
.
git/NOTES_MERGE
_
WORKTREE
.
.
.
Inspired-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge
:
use opendir/r
e
ad
d
ir instead of
u
si
n
g
rea
d
_dire
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rl
a
nd
t3310: ill
u
strate failure to "notes merge --co
m
mit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Junio C Haman
o
remove_dir_recurs
i
vely(): Add flag for skipping re
m
oval
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
J
u
n
i
o
C Ham
a
no
Gi
t
1
.
7
.
10-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Heni
g
an
c
o
ntrib/diffall: fix cleanup trap
o
n
Wi
n
d
ows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Ti
m
Henig
a
n
cont
r
ib/diffall: eliminate
d
uplicate while loop
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Heni
g
an
co
n
trib/
d
i
f
fall: eliminate us
e
of tar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
T
im
Henigan
cont
r
i
b/d
i
f
f
a
l
l:
c
r
e
ate tmp
dirs witho
u
t mk
t
emp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Hen
i
gan
con
t
rib/
d
i
f
fall: c
o
mment actua
l
reason for 'cdup
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Thomas Rast
diff:
t
weak a _copy_ of diff_optio
n
s
with word
-
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
b
uiltin
_
d
i
ff_cmd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Johan
n
e
s Sixt
t4034: di
f
f
.
*
.
wordregex should no
t
be "sticky" in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim He
n
i
g
a
n
Docu
m
enta
t
i
o
n
/d
i
ff-options
:
rew
o
rd
d
escription
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Juni
o
C Hamano
Merge branch 'jc/i18n-shell-s
c
r
i
pt-gettext'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hamano
Merge branch 'jc/maint-undefined-i18n-ob
s
ervation
-
tes
t
'
commit
|
commitdiff
|
tree
2012-03-13
Junio C
Hama
n
o
Merge b
r
anch
'
m
s/
m
aint
-
config-error
-
at-eol-linecou
n
t'
commit
|
commitdiff
|
tree
next