repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/commit-unedited-template' into maint
2012-04-26
Junio C Hamano
Merge branch
'
jc/commit-
u
nedited-t
e
mplate' into maint
By
Junio C Hamano
(4) and Adam Monsen (1)
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Haman
o
Merge bran
c
h 'jk/
a
dd-p-skip-conflicts'
into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Hamano
Merge branc
h
'jc/
c
om
m
it-hoo
k
-aut
h
orship
'
into maint
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Hamano
Merge branch 'tr/maint-wo
r
d-diff-regex-sticky' into
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Junio
C Hamano
M
e
rge bran
c
h
'jh/notes-
m
erge
-
i
n
-git-dir-w
o
rktre
e
' into
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio
C H
a
m
ano
Sync with 1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C Hamano
G
i
t 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
Junio C Hamano
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Haman
o
Sync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
J
unio
C Hama
n
o
Git 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
o
nathan N
i
eder
bundle: remove stray
s
i
ngle-quote from er
r
or 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
Merg
e
branch 'maint-
1
.
7
.
9' into main
t
commit
|
commitdiff
|
tree
2012-04-10
Junio C H
a
ma
n
o
M
erge
b
ranc
h
'
m
ain
t
-
1
.
7
.
8' in
t
o main
t
-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-10
René Schar
f
e
test-s
u
b
pr
o
c
ess: fix segfault
without arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Re
n
é
Sc
h
a
rfe
submodule: f
i
x protot
y
p
e of
g
itmodules_
c
o
nfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hama
n
o
M
e
rge bran
c
h 'jc/maint-verify-objects-remove-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge
br
a
nch
'
dw/gitweb-doc-gra
m
mo'
into maint-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C Hamano
M
e
rge b
r
anch 'tr/cache-tre
e
' into ma
i
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Hamano
Merg
e
branch 'cb/maint-t5541-make-server-
p
ort-
p
ortable
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
ma
n
o
Me
r
ge branch 'cn/maint-r
e
v-list-doc
'
into
m
aint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Hamano
Merge branch '
t
r
/maint
-
bundle
-
boundary' into
ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C Hamano
Merge b
r
anch
'
tr
/
m
a
int-b
u
ndle-lon
g
-s
u
bjec
t
'
into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o
C
Ha
m
ano
M
e
rge branch 'ph/rerere-doc' i
n
to maint
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
Juni
o
C Hamano
Git 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-06
Felipe Cont
r
e
r
as
s
pec: add missing build depend
e
ncy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
Je
f
f King
add--interac
t
i
ve:
i
gnore un
m
erged entries
i
n
p
a
tch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
Jun
i
o
C
Hama
n
o
D
o
c
u
m
entation
/
g
i
t-commit
:
rephrase the "i
n
itial-ness
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
J
u
ni
o
C
Hamano
G
it 1
.
7
.
10-rc
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C H
a
m
a
no
Me
r
ge branch 'pt/git
k
'
commit
|
commitdiff
|
tree
2012-04-02
Junio C Ha
m
a
no
S
ync with 1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
J
uni
o
C Hamano
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
b
r
anch
'
jc/maint-merge-a
u
toed
i
t' into maint
commit
|
commitdiff
|
tree
2012-04-02
Pat Thoyts
gitk:
f
ix s
e
tting font display with new
tabbed dialog
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Pat
Thoyts
gitk: fix tabbed p
r
eferences construction when us
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C H
a
mano
M
e
r
g
e
g
it:
/
/github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-04-01
A
d
a
m Monsen
g
it-com
m
it
.
t
x
t: clarify -t
r
equi
r
e
s edit
i
ng 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 Hama
n
o
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2012-03-30
J
u
nio
C
Ha
m
ano
c
o
mm
i
t
: reph
r
ase
t
he error
w
hen user di
d
not touch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Junio C Hamano
c
ommit: do
not trigger bogu
s
"
has temp
l
ated messa
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Junio C Ha
m
ano
t
7
501:
test the right kind of breaka
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-30
Hei
k
o
V
o
igt
string-list: document that s
t
r
ing_
l
ist_insert
(
) inserts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
René Sch
a
rfe
config
:
remo
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 Meye
r
ing
correct a few doubled-word
nits in comme
n
ts and
documentatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
J
im
Meyering
co
r
rect spelling: an URL -> a URL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
Junio C Hamano
l10n updates for G
i
t 1
.
7
.
10-rc1
commit
|
commitdiff
|
tree
2012-03-27
Zbigniew Jędrzeje
w
sk
.
.
.
tests: unset
C
O
LUM
N
S inher
i
ted fr
o
m
environment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
J
u
nio C Hamano
U
p
d
a
t
e
dr
a
ft
release notes to 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
J
unio
C H
a
mano
Sync
w
ith 1
.
7
.
9
.
5
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C Ham
a
no
Git 1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ham
a
no
Merge branch
'
jn/
m
a
i
nt-fast-import-empty-l
s
' into maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ha
m
ano
M
e
r
ge bra
n
ch 'ph/rerere-doc' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C
H
a
mano
Merg
e
branch 'ms/maint-config-error-at-eol-linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
M
a
r
k Lodato
grep doc: add --
b
reak / --heading / -W
to synopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rodrig
o
Silva (
M
estr
.
.
.
Documentat
i
o
n
:
im
p
rove desc
r
ipt
i
on of GIT_E
D
ITOR and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Nels
o
n Beni
t
ez Leon
documentatio
n
: fix alphabetic ordere
d
l
i
st for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-24
Junio C Ham
a
no
Merge gitk changes from Pau
l
Mackerras a
t
git://ozlabs
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
Git 1
.
7
.
10-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
J
unio C H
a
ma
n
o
.
mailmap: unify various old mail addresses of gitste
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
J
unio C
H
ama
n
o
Merge branch 'am/co
m
pletion-zsh-fix
'
commit
|
commitdiff
|
tree
2012-03-23
J
u
nio C Hamano
Mer
g
e branch 'dw/gitweb
-
do
c
-grammo'
commit
|
commitdiff
|
tree
2012-03-23
D
Waitz
m
an
Documentation/
g
itweb: triv
i
a
l
English
f
ixes
commit
|
commitdiff
|
tree
2012-03-21
Alex Merry
c
o
n
t
rib/c
o
mplet
i
o
n
: "local var=()" is misinte
r
p
r
e
ted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Hamano
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge b
r
a
n
ch 'maint-1
.
7
.
8' into
m
a
i
nt
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C Hamano
merge: bac
k
port GIT_MERGE_AUTOEDIT support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio
C
H
a
man
o
M
e
r
g
e branch 'ks/sort
-
wild
c
ard-in-makefile' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
J
unio C Hamano
Merge
branch
'
j
c/a
d
vise-i18n' into
m
aint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio
C Hamano
Merge branch 'jn/gitwe
b
-unspec
i
f
i
ed-action' into
m
ai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio C
Ham
a
no
Merge
b
r
anc
h
'ab/per
l
-i
1
8n'
commit
|
commitdiff
|
tree
2012-03-16
Ævar Arnfjörð Bjarmason
p
e
rl/Make
f
ile:
inst
a
ll Git:
:
I18N un
d
e
r NO_PERL_M
A
KE
M
AKER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Juni
o
C Ha
m
a
no
Upd
a
te draft release n
o
tes to
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Junio C Haman
o
Merge
bran
c
h
'
th/mergetools-d
e
ltawalker'
commit
|
commitdiff
|
tree
2012-03-16
Ju
n
io C Hamano
Merge branch 'j
c
/maint-verify-objects-remove-pessi
m
ism'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Ha
m
ano
M
e
rge br
a
nch 'sl/customize-san
e
-tool-path'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
M
erge "two fixes for f
a
st-import's 'ls'
c
om
m
and" from
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio C
Hamano
Merge br
a
nch
'th
/
git-diffall'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Mer
g
e branc
h
'th/
d
oc-dif
f
-s
u
bmodule-
o
ption'
commit
|
commitdiff
|
tree
2012-03-15
J
uni
o
C
H
amano
fetch/re
c
eive:
re
m
ove o
v
er
-
pessimistic
c
onnectivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Tim Henigan
Docu
m
ent
a
tion/difftool: add deltawalker to list of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han H
e
r
land
notes-merge: Don't
r
emove
.
git/NOTES
_
ME
R
GE_WORKTREE
.
.
.
Inspired-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han Herla
n
d
notes-merge: use opendir/readdir instead of
u
sing read_direc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t3
3
10: i
l
lustrate failure to "notes me
r
g
e
-
-
commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Junio C Haman
o
remove
_
dir_recursively(): Add flag for
skipp
i
ng
r
e
m
oval
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Junio C Hamano
G
it 1
.
7
.
1
0
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
cont
r
ib/diffall: fi
x
c
l
ea
n
up t
r
a
p on Wi
n
dows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim
He
n
igan
contrib/diffall:
e
li
m
inate duplicate
while l
o
op
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Heniga
n
contrib/diffall: eliminat
e
use of
tar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Heniga
n
contrib/di
f
fall: cr
e
ate tmp dirs without mktemp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Ti
m
Henigan
contrib
/
d
i
ffall: comm
e
n
t actual reason
f
or
'cd
u
p'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Thoma
s
Rast
diff: tw
e
ak a _copy_ of diff
_
option
s
with word-diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Thomas Rast
diff: refa
c
tor the
word-diff
s
etup
f
ro
m
builti
n
_
diff_
c
m
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Johannes Sixt
t4034: d
i
ff
.
*
.
w
o
r
dregex should
not b
e
"
sticky" i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Ti
m
Henigan
D
o
cumen
t
a
t
ion/diff-options: reword description of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Junio C
Hamano
Merge branch '
j
c/i18n-she
l
l-scri
p
t-gettext'
commit
|
commitdiff
|
tree
2012-03-13
Junio C H
a
man
o
Merge branch 'jc/maint-
u
ndefin
e
d-i18n-observ
a
t
i
on-test'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hamano
Me
r
g
e b
r
anch 'ms/ma
i
nt-
c
on
f
ig-er
r
o
r
-at-eol
-
linecoun
t
'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hamano
Merge branch 'ph/rerere-doc'
commit
|
commitdiff
|
tree
2012-03-13
Junio C H
a
man
o
am: offi
c
ial
l
y de
p
recate -b/--b
i
n
ary opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next