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 'jk/add-p-skip-conflicts' into maint
2012-04-26
J
unio C Hamano
Merge bran
c
h 'jk/add-p-skip-conflic
t
s' into
main
t
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o
C Hamano
Merge branch 'j
c
/commit-h
o
o
k
-authorship'
i
n
to
ma
i
nt
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hama
n
o
M
e
r
g
e branch 'tr/maint-wo
r
d-
d
iff-r
e
ge
x
-
s
ticky' into
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Hama
n
o
Me
r
ge branch 'jh
/
no
t
es-merge-in-gi
t
-
d
i
r-workt
r
e
e' into
.
.
.
By Johan Herland (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
a
ma
n
o
Sync w
i
th
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
J
unio C Ham
a
no
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
J
u
nio C Ham
a
no
Git 1
.
7
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
Junio
C
Hamano
Sync with 1
.
7
.
7
.
7
commit
|
commitdiff
|
tree
2012-04-26
J
u
n
io C
H
a
man
o
Git 1
.
7
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-26
J
onatha
n
Nieder
bund
l
e: re
m
ove stra
y
singl
e
-quote fr
o
m err
o
r 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
Merge bra
n
ch
'
ma
i
nt-1
.
7
.
9' into maint
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
Merge b
r
anch 'maint-1
.
7
.
8
' into maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-10
René Schar
f
e
t
e
st-subprocess: f
i
x
se
g
fault withou
t
arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
René
S
c
harf
e
submodul
e
:
f
i
x prototyp
e
of gi
t
modules_confi
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hamano
Merge branch 'jc/maint-
v
erify-object
s
-remo
v
e-pessimis
m
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C
H
ama
n
o
Merge branch 'dw/gitweb-doc-gr
a
mmo' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
J
u
nio C Hamano
Merge branch 'tr/cache-tr
e
e' into
maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
Merge bra
n
ch 'cb
/
maint-t5
5
4
1
-
make-server-
p
o
r
t-portable
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C
Hama
n
o
Merge branch 'cn/ma
i
nt-
r
ev-l
i
st
-
d
oc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Ha
m
ano
Merge b
r
a
n
ch 't
r
/maint-bundle-boundary' into
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C
Hamano
Merge br
a
n
ch 'tr/main
t
-bundl
e
-long
-
subje
c
t' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
Merge bran
c
h '
p
h/rerere-doc'
into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
Ju
n
io C H
a
m
ano
G
it 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-06
Felipe C
o
ntr
e
ra
s
spec: add m
i
ssing buil
d
dependency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-05
J
e
f
f King
add--interactive: ignore unmerged entries i
n
patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
Juni
o
C
H
amano
G
i
t 1
.
7
.
10-rc
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
J
u
ni
o
C
Hama
n
o
M
erge branch 'pt
/
gitk'
commit
|
commitdiff
|
tree
2012-04-02
J
unio
C Hamano
S
ync
w
i
t
h 1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
Ju
n
io C Ham
a
no
Gi
t
1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Merge
b
ranch '
j
c/maint
-
m
e
rg
e
-auto
e
di
t
'
into main
t
commit
|
commitdiff
|
tree
2012-04-02
Pat T
h
oyts
g
i
tk: fix
setting font displ
a
y with new tabbed dialog
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Pat
Thoyts
git
k
:
fix tabbed
p
references construction when
u
sing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Jun
i
o C H
a
mano
Me
r
ge g
i
t://github
.
com/git
-
l
1
0n
/
git-
p
o
commit
|
commitdiff
|
tree
2012-03-31
Junio
C
Ha
m
ano
Merge b
r
anch 'm
a
int
'
commit
|
commitdiff
|
tree
2012-03-30
Heiko Voig
t
s
t
ring-l
i
st: doc
u
ment that string
_
li
s
t
_insert()
in
s
ert
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
R
ené Sc
h
arfe
config: r
e
move useless assig
n
m
e
n
t
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
c
o
rrect a few doubled-word nits
in com
m
ents 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 spell
i
ng: an U
R
L -> a URL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
Junio
C
Hamano
l10n
u
pdates
for Git 1
.
7
.
10-
r
c
1
commit
|
commitdiff
|
tree
2012-03-27
Zbig
n
iew Jędrzejewsk
.
.
.
test
s
: uns
e
t COL
U
MNS
inherite
d
from environment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
J
unio
C
Hamano
Update dra
f
t
release notes t
o
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
io C
H
amano
S
yn
c
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 H
a
mano
Merge branch 'jn/main
t
-fas
t
-
i
mport-empty-ls' into
m
aint
commit
|
commitdiff
|
tree
2012-03-26
J
unio C Hamano
Me
r
ge
branch
'ph/
r
erere-doc' i
n
to maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Ha
m
ano
Merg
e
branc
h
'ms/maint-config-erro
r
-at-eol-linec
o
unt
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark Lodat
o
grep d
o
c: add --break / --head
i
n
g
/ -W
t
o synopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo
Silva (Mes
t
r
.
.
.
Do
c
umenta
t
ion
:
improve description of GIT_
E
DITOR an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Nelson Ben
i
te
z
Leon
docume
n
ta
t
io
n
: fix
a
lphab
e
tic or
d
ere
d
list for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-24
Juni
o
C Hamano
Merge
gitk c
h
anges
f
rom Paul
M
acker
r
a
s
at
g
it://ozlabs
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
Junio
C
H
amano
Git 1
.
7
.
10-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
.
mailmap: unif
y
various
o
ld
mail addr
e
sse
s
o
f gitster
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Junio C Haman
o
Merge branc
h
'am/co
m
pletion-zsh-fix'
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
Merge branch 'dw/
g
itw
e
b-d
o
c-grammo'
commit
|
commitdiff
|
tree
2012-03-23
D Waitzman
Docum
e
ntation
/
gitweb: trivial English fixes
commit
|
commitdiff
|
tree
2012-03-21
Alex Merry
contrib/comp
l
et
i
on: "local var=()"
is mis
i
nterpreted
.
.
.
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
Junio C Ham
a
no
M
erge branc
h
'maint-1
.
7
.
8' into main
t
commit
|
commitdiff
|
tree
2012-03-20
J
unio C
Hamano
m
e
rge: backport GIT
_
ME
R
G
E
_AUTOEDIT
s
u
pport
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Hamano
Merge branch
'
k
s
/
s
ort-wildcard-
i
n-makefile' into main
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C
H
amano
Mer
g
e branch 'jc/a
d
vise-i18n' i
n
to ma
i
n
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
J
u
n
io
C
Hamano
Merge
b
r
a
nch 'jn/
g
itweb
-
unspecified-actio
n
' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio C
Ham
a
no
Merge br
a
nch '
a
b/pe
r
l
-i18n'
commit
|
commitdiff
|
tree
2012-03-16
Ævar Arnfjör
ð
Bjarmason
per
l
/Makefile
:
inst
a
ll
Git::I18N under NO
_
P
ERL_MAKEM
A
KER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Upda
t
e draf
t
rel
e
ase notes to 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
J
unio
C
Hamano
M
erge b
r
a
n
ch 'th/mergetools-de
l
tawalker'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge
branc
h
'jc/main
t
-ver
i
fy-
o
bjects-remov
e
-pessimism'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
M
erge
b
ran
c
h 'sl/
c
us
t
omize-sane-tool-path'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge "two fixes for fast-import'
s
'ls' c
o
mmand" from
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge branch
'
t
h
/
git
-
d
i
ffall'
commit
|
commitdiff
|
tree
2012-03-16
Junio C
Hamano
Me
r
ge b
r
anch 'th/d
o
c-d
i
ff-submodul
e
-opt
i
on'
commit
|
commitdiff
|
tree
2012-03-15
Junio C
Hamano
fetch/rece
i
ve
:
remove over-pes
s
imi
s
tic connectivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Tim Henigan
Doc
u
me
n
t
ation/difftool: add de
l
tawal
k
er to list
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: D
o
n't remove
.
git/NOTES
_
MERGE
_
WORKTR
E
E
.
.
.
Inspired-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
J
oh
a
n He
r
la
n
d
n
o
tes-me
r
ge:
u
se opendir/re
a
ddi
r
i
nstead of using
r
ead_direc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t3310: il
l
ustrate
failure to "n
o
t
e
s me
r
ge -
-
com
m
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Ju
n
io C
H
amano
remove_dir_re
c
u
rsively():
A
dd flag for s
k
ip
p
ing
removal
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Junio C
H
amano
Git 1
.
7
.
10-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Heniga
n
contrib/diffall: f
i
x clea
n
u
p trap on Window
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
contr
i
b/diffall: el
i
m
i
nate duplicate whi
l
e loops
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Ti
m
H
e
nigan
contrib/dif
f
all: elimina
t
e use of tar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
contrib/di
f
fall: create tmp dirs without
m
k
t
emp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim H
e
nigan
cont
r
ib/diffal
l
: com
m
ent a
c
tu
a
l
r
ea
s
on
for 'c
d
u
p
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Thomas Rast
diff: tweak a
_
c
opy_ of diff
_
options with word-diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Thomas
R
a
s
t
d
i
ff: r
e
factor the word
-
diff se
t
u
p
from builtin_diff_cmd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Johannes Sixt
t4034: diff
.
*
.
wordregex should not be "sticky
"
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
Documenta
t
ion/diff-opt
i
ons: rewo
r
d description of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Junio C
H
a
mano
Merge
b
r
anch 'j
c
/
i
1
8
n-shell-script-get
t
ext'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hamano
Merge
b
ranch 'jc/
m
a
i
nt
-
undefined-i18
n
-observation-tes
t
'
commit
|
commitdiff
|
tree
2012-03-13
J
u
nio C
H
am
a
no
M
e
rge
branch 'ms/maint-config-error-at-eol-linec
o
unt'
commit
|
commitdiff
|
tree
2012-03-13
J
unio C Hamano
Mer
g
e bra
n
c
h 'ph/rerere-doc'
commit
|
commitdiff
|
tree
2012-03-13
Juni
o
C Hamano
am:
o
f
f
icially
de
p
r
e
cate -
b
/-
-
bin
a
ry option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o C H
a
m
a
n
o
U
pd
a
te draft
relea
s
e notes
to 1
.
7
.
10
b
e
f
ore -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
M
erge branch
'
az/ve
r
i
fy-tag-use-gpg-c
o
nfig'
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hama
n
o
S
y
nc 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 Ham
a
no
Merge branch
'tr/maint-bundle-
b
ound
a
ry' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge branch
'jc/maint-dif
f
-
patch-header' int
o
ma
i
nt
By
Junio C Hamano
commit
|
commitdiff
|
tree
next