repo.or.cz
/
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 'jh/notes-merge-in-git-dir-worktree' into maint
2012-04-26
Juni
o
C Hamano
M
e
rge br
a
nch 'jh/notes-mer
g
e-in-
g
it-
d
ir
-
worktree' into
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
i
o
C
H
amano
Sync with 1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io C H
a
mano
Git 1
.
7
.
9
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Syn
c
wit
h
1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io
C Haman
o
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
unio C Hamano
S
ync 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
Jonatha
n
N
ied
e
r
bundle: rem
o
ve
st
r
ay s
i
ngle-quote fro
m
error messag
e
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
Merge branch 'maint-1
.
7
.
9' int
o
maint
commit
|
commitdiff
|
tree
2012-04-10
Ju
n
io
C Ha
m
ano
Merge bra
n
ch 'maint-
1
.
7
.
8
'
into maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-10
René S
c
harfe
test-subprocess: fix se
g
fault wit
h
o
u
t arg
u
me
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
René Scha
r
f
e
submodule: fix prototy
p
e of gitmodules_
c
onf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ham
a
no
Merge branch '
j
c/maint-verify-o
b
jects-remove-pessimism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hama
n
o
Merge branch 'dw/g
i
t
web-doc-
g
rammo' into maint-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
u
n
io C Hamano
Merge bra
n
ch 'tr
/
cache-t
r
ee'
i
n
t
o mai
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ha
m
ano
Me
r
ge branch
'
c
b/main
t
-t5541
-
make-server-port-portabl
e
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C Haman
o
Mer
g
e b
r
anc
h
'
cn/maint-rev-l
i
st-doc' into main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ham
a
no
M
e
rg
e
branch '
t
r/maint-bundle-boundary'
in
t
o main
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Jun
i
o C H
a
mano
Merge
b
ra
n
ch 'tr/maint-bundle-long-su
b
ject' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
unio C Hamano
Merge bra
n
c
h
'ph/rerere-do
c
' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
Junio
C
Hamano
G
it 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-06
F
elipe Contreras
spec: add m
i
s
s
i
n
g build dependency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
Junio C Hamano
Git 1
.
7
.
1
0
-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
J
unio
C H
a
mano
Merge
b
ranch 'pt/gitk'
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Sync w
i
th 1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
Ju
n
io
C
Hamano
G
i
t 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C H
a
mano
M
e
rge branch 'j
c
/maint-merge-a
u
toed
i
t' into maint
commit
|
commitdiff
|
tree
2012-04-02
Pa
t
Thoyts
g
i
tk
:
fix sett
i
ng font
display wit
h
new tab
b
ed
dia
l
og
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Pat Thoyts
g
i
tk: fix
t
ab
b
ed pre
f
erences construction whe
n
using
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
J
un
i
o C H
a
mano
Merg
e
git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-03-31
Junio C
Hamano
M
e
rge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2012-03-30
Heiko Voigt
s
trin
g
-list
:
docu
m
ent that string_
l
is
t
_insert() inser
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
René Sc
h
arfe
config:
r
emove useless assignment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Junio C H
a
mano
Git 1
.
7
.
10-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim Meyering
c
or
r
e
c
t
a few
d
oubled-word
nits in co
m
ments a
n
d docu
m
enta
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim Meyering
corr
e
ct sp
e
lli
n
g: an URL
-> a
U
RL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
J
u
nio C H
a
mano
l10n updat
e
s for Git 1
.
7
.
10
-
r
c1
commit
|
commitdiff
|
tree
2012-03-27
Zbigniew Jęd
r
zejewsk
.
.
.
tests: unset
C
OLUMN
S
inherited
from enviro
n
me
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
J
u
nio C Hamano
Update draft release
notes to
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
J
unio C Hamano
S
y
nc with 1
.
7
.
9
.
5
commit
|
commitdiff
|
tree
2012-03-26
J
unio C Hamano
Git
1
.
7
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
Ha
m
ano
Merge branch 'jn/maint
-
fast-import-empty
-
ls'
into maint
commit
|
commitdiff
|
tree
2012-03-26
J
u
nio C
H
amano
Merge
branch
'ph/r
e
rere-d
o
c' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Merge branc
h
'
m
s/maint-config
-
error-at-eol-li
n
ecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark
L
odato
grep
doc: add --bre
a
k
/
--headin
g
/ -W to
synopsi
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo Si
l
va (M
e
str
.
.
.
Docum
e
ntation: impr
o
ve descr
i
ption
o
f GIT_ED
I
TOR and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Ne
l
son Benitez
Leon
d
ocumentatio
n
: fix a
l
phabe
t
ic ordered list for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-24
Junio C
H
a
m
ano
Me
r
g
e gitk changes f
r
o
m Pa
u
l Macke
r
ra
s
at
g
it://o
z
l
abs
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
J
unio
C
Hamano
Git 1
.
7
.
10-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
J
u
ni
o
C
H
amano
.
mailmap: u
n
ify variou
s
old mail addresses of gitster
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
J
u
nio C Hamano
Merge branch 'am/compl
e
t
i
on-zsh-fix'
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
Mer
g
e branch '
d
w/gitweb
-
doc
-
grammo'
commit
|
commitdiff
|
tree
2012-03-23
D Waitz
m
an
Documentat
i
on/gi
t
web: t
r
ivial E
n
gli
s
h fixes
commit
|
commitdiff
|
tree
2012-03-21
Ale
x
Merry
contrib/completion: "local
v
a
r
=()" is misinterpreted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2012-03-20
Jun
i
o
C
Hamano
Merge branc
h
'maint-1
.
7
.
8'
i
nto maint
commit
|
commitdiff
|
tree
2012-03-20
Juni
o
C H
a
mano
mer
g
e:
b
ackport GIT_
M
ER
G
E_AUTOEDIT support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branch 'ks/sor
t
-
w
i
ldcard-
i
n
-makefile'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge
branch 'jc/adv
i
se-i18n' into
m
aint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branch 'jn/g
i
tweb-unspec
i
fied-a
c
tion' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Ju
n
io
C
Ha
m
ano
Merg
e
b
r
a
nch
'ab/perl-i1
8
n'
commit
|
commitdiff
|
tree
2012-03-16
Ævar Arnfjörð Bjarmason
perl/Makefile:
i
nstall Git::I18N under NO_PE
R
L_MAKEMA
K
E
R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Ju
n
io C
H
ama
n
o
U
pdate draft r
e
l
ease notes to 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
J
un
i
o
C
Hama
n
o
M
erge branch 'th/mergetools-deltawal
k
er'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
M
e
rge bran
c
h 'jc/maint-verify-o
b
jects-remove-pessimism'
commit
|
commitdiff
|
tree
2012-03-16
J
u
nio C Ha
m
ano
M
e
rg
e
b
r
anch 's
l
/customize-sane-to
o
l-path'
commit
|
commitdiff
|
tree
2012-03-16
Junio
C
Hamano
Me
r
ge "tw
o
f
ix
e
s
fo
r
f
ast-import's 'ls' command" from
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
J
unio C Hamano
Merge br
a
n
c
h
'
th/g
i
t-
d
iffa
l
l'
commit
|
commitdiff
|
tree
2012-03-16
Jun
i
o C Haman
o
Merge bran
c
h 'th/doc-diff-submod
u
le-option'
commit
|
commitdiff
|
tree
2012-03-15
J
u
n
io C Ham
a
no
f
etch/rece
i
ve: remove
o
v
e
r-pessimistic
c
o
n
n
e
c
tivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Tim Henigan
Documentati
o
n
/difftool: add deltawal
k
er to list of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
n
otes-
m
e
rg
e
: Don'
t
remo
v
e
.
git
/
NO
T
ES_MER
G
E_WORKT
R
EE
.
.
.
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:
us
e
op
e
ndi
r
/re
a
dd
i
r instead of usi
n
g read_direc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herlan
d
t3310: illus
t
rate failure to
"n
o
tes
merge --commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Junio C H
a
ma
n
o
r
e
move_dir_re
c
u
rsively(): Add flag
f
or skipping removal
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Junio C
H
amano
G
it
1
.
7
.
10-rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
contrib/d
i
f
f
all:
f
i
x cleanup trap on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
c
ontr
i
b/d
i
ffall: eliminate dup
l
icate
w
hile loops
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim He
n
igan
c
o
ntrib
/
diff
a
ll: el
i
m
i
nate
u
se
o
f
tar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
T
i
m Henigan
con
t
rib/diffall: crea
t
e tmp di
r
s
without mktemp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Hen
i
gan
contrib/d
i
f
f
a
ll: comment actual reason for 'cdup'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Heni
g
an
Documentation/
d
iff-o
p
tions:
r
ewor
d
descr
i
ption of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
J
u
n
i
o C Hamano
M
e
r
ge
branch 'jc/i18n-shel
l
-s
c
ript-ge
t
te
x
t'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Ha
m
ano
Merge branch 'j
c
/maint
-
undefin
e
d-i18n-observ
a
t
i
on-test'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hamano
Merge
branch 'ms/maint-config-error-at-eol-
l
inecount'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hamano
Merge
b
r
a
n
c
h
'
ph/rerere-doc'
commit
|
commitdiff
|
tree
2012-03-13
Junio C
H
a
m
a
no
a
m
: officially deprec
a
te -b/--
b
in
a
ry opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
u
nio C Hamano
Update dr
a
ft
r
ele
a
se
n
otes to 1
.
7
.
10 befo
r
e
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
u
nio C
Ham
a
no
Merge bra
n
ch 'az/verify-tag-us
e
-
g
pg-
c
onfig'
commit
|
commitdiff
|
tree
2012-03-12
Junio C Haman
o
Sync w
i
th 1
.
7
.
9
.
4
commit
|
commitdiff
|
tree
2012-03-12
Juni
o
C Haman
o
Git 1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Haman
o
M
erge bra
n
ch
'tr/maint-bundle-bo
u
ndary
'
into maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Me
r
ge branch 'jc/maint-d
i
ff-patch-head
e
r
' int
o
m
aint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge
bran
c
h 'jn/maint-do-not-match-with-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
io C
Hamano
M
e
rge branch 'jc/am-3-no
n
standard-popt' into maint
commit
|
commitdiff
|
tree
2012-03-12
Thom
a
s
Ra
s
t
git-am:
error out
w
hen
s
e
e
i
n
g -b
/
--bina
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C H
a
mano
i
18n: f
i
x a
u
to detecti
o
n o
f
g
e
t
text sc
h
eme for sh
e
ll
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Martin Stenberg
c
o
n
fig: report errors at the
E
OL with corr
e
ct li
n
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
u
nio C Hama
n
o
Merge h
t
tps://github
.
c
om/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-03-10
Æ
var Arnfjö
r
ð Bjarmas
o
n
Git:
:
I18N:
compatibili
t
y with perl <5
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next