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
Ju
n
io C Haman
o
M
e
rge
b
ranch 'jk/add-p-s
k
ip-c
o
nflicts' into maint
commit
|
commitdiff
|
tree
2012-04-26
Junio C Hamano
Merge br
a
nch 'jc
/
comm
i
t-
h
ook-authorship' i
n
to maint
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io
C Ham
a
no
Merge branch 'tr/maint-word-diff-r
e
ge
x
-sticky
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
io
C Hama
n
o
Merge branc
h
'
jh/
n
otes-mer
g
e
-in-git-dir-workt
r
ee'
into
.
.
.
commit
|
commitdiff
|
tree
2012-04-26
Jun
i
o
C
Hamano
S
y
nc
w
it
h
1
.
7
.
9
.
7
commit
|
commitdiff
|
tree
2012-04-26
Junio C
H
amano
Git
1
.
7
.
9
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Ju
n
i
o C Ha
m
a
n
o
Sync with 1
.
7
.
8
.
6
commit
|
commitdiff
|
tree
2012-04-26
Juni
o
C
H
am
a
n
o
G
i
t 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
Junio C
Hamano
Git
1
.
7
.
7
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-26
Jo
n
athan
Nieder
bun
d
le: remove stray si
n
gle-quote from error
m
essage
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
M
e
rge branc
h
'm
a
int
-
1
.
7
.
9'
i
nto m
a
int
commit
|
commitdiff
|
tree
2012-04-10
Junio C Hamano
Merge branc
h
'maint-1
.
7
.
8' into maint-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-10
René Scharfe
test-sub
p
rocess: fix
segfault withou
t
argum
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-10
Re
n
é Scharf
e
subm
o
dule: fi
x
p
r
oto
t
ype of gitmodules
_
co
n
fig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'jc
/
maint-
v
e
r
ify-objects-remove-pe
s
simism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
Merge branch 'dw/g
i
tweb-doc-gr
a
mmo' into maint
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge
b
r
anch 'tr/c
a
c
h
e-tree' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Ha
m
ano
Merge branch 'cb/maint-t
5
541-make-server-po
r
t-portabl
e
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branc
h
'
c
n/maint-rev
-
list-doc' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C
Hamano
Merge branch 'tr/main
t
-bundle-boundary' into main
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C H
a
mano
M
e
rge branch 'tr/
m
aint-bundle-
l
o
n
g
-
s
u
b
ject' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
J
unio C Ha
m
ano
Merge
b
ranch
'ph/
r
erere
-
do
c
' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
Junio C Haman
o
Git 1
.
7
.
10
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-06
Feli
p
e
Contre
r
a
s
spec: add missing
b
ui
l
d dependency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-05
Je
f
f
King
add--interac
t
ive: ignore unmerged en
t
ries in patch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-03
J
unio C Hamano
Git
1
.
7
.
10-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Merge branch 'pt/gitk
'
commit
|
commitdiff
|
tree
2012-04-02
Junio C
Hamano
Sync with
1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
Junio
C
Ham
a
n
o
Gi
t
1
.
7
.
9
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Ha
m
ano
Merge
branch 'jc/maint-mer
g
e-aut
o
e
dit' into main
t
commit
|
commitdiff
|
tree
2012-04-02
Pat
T
hoy
t
s
gitk: fix settin
g
font display w
i
th new
tabbed dialo
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
Pa
t
Thoyts
git
k
: fix tabbed
prefere
n
ces construction when using
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-02
J
u
ni
o
C Hamano
Merge git:
/
/github
.
co
m
/g
i
t-l
1
0
n
/git-po
commit
|
commitdiff
|
tree
2012-03-31
Juni
o
C
H
amano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2012-03-30
H
eiko Voigt
stri
n
g
-list:
document that str
i
ng_li
s
t_insert() inse
r
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-28
Re
n
é Scharfe
con
f
ig: remove us
e
less assig
n
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-28
Junio
C
Haman
o
Gi
t
1
.
7
.
10-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-28
Jim Me
y
ering
corr
e
ct a few doubl
e
d-
w
ord
n
i
ts in comm
e
n
t
s
a
nd
documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-28
Jim Mey
e
ring
c
o
rrect spelling: an URL -> a URL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-27
Junio
C
H
a
mano
l10n up
d
ates for
Git
1
.
7
.
10-rc1
commit
|
commitdiff
|
tree
2012-03-27
Zbi
g
niew Ję
d
r
z
ejews
k
.
.
.
tests: un
s
et CO
L
UMNS inh
e
rited from
e
nvironment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
U
pdate draft rel
e
ase notes
to 1
.
7
.
10
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Ju
n
i
o C Ha
m
a
no
S
ync wi
t
h 1
.
7
.
9
.
5
commit
|
commitdiff
|
tree
2012-03-26
Junio C
Ha
m
ano
Git 1
.
7
.
9
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
J
uni
o
C
Hamano
Merge branch
'
jn/maint-fast-imp
o
rt-empt
y
-
ls' into maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Haman
o
Me
r
ge
branch 'ph/rer
e
re-d
o
c' into main
t
commit
|
commitdiff
|
tree
2012-03-26
J
unio C Hamano
Me
r
ge
b
ranch 'm
s
/m
a
in
t
-config-error-at-eol-l
i
necount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
Mark Lodato
gre
p
doc
:
add
-
-b
r
eak / --head
i
ng / -W to synops
i
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Rodrigo Si
l
va (Me
s
tr
.
.
.
Docume
n
tation:
i
mprove description of GIT_EDITOR and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-26
Nelso
n
Be
n
itez L
e
o
n
d
o
cumentation: fix
al
p
habetic ordered list
f
or git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-24
Junio
C Hamano
Mer
g
e gitk chang
e
s from Paul
M
ackerras at git://ozlabs
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
Ju
n
i
o
C Hamano
G
i
t
1
.
7
.
10-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
.
mail
m
ap: unify various ol
d
ma
i
l ad
d
resses o
f
gitster
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-23
Junio C
Ha
m
an
o
Merge branch 'am/com
p
l
e
tion-z
s
h-fix'
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
Mer
g
e br
a
nch 'dw/gitweb-d
o
c-g
r
a
mmo'
commit
|
commitdiff
|
tree
2012-03-23
D Waitz
m
a
n
Documentation/gitweb: trivi
a
l En
g
lish fixe
s
commit
|
commitdiff
|
tree
2012-03-21
Alex Merry
cont
r
ib/completio
n
:
"local
v
ar=(
)
" is misinterpreted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Junio C
Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2012-03-20
Junio
C
Hamano
M
e
rg
e
branch 'main
t
-1
.
7
.
8' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-03-20
J
un
i
o C Hamano
me
r
ge: backpor
t
GIT_MERG
E
_AUTOEDIT support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Ham
a
no
M
erge branch 'ks/sort-wild
c
ard-in
-
make
f
ile' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C H
a
m
a
no
Merg
e
branch 'jc/advise-i
1
8n' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
io C Hamano
Mer
g
e branch 'jn/g
i
tw
e
b-un
s
pecified-actio
n
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio
C
Ha
m
ano
Merge b
r
anch
'
ab/perl-i18n'
commit
|
commitdiff
|
tree
2012-03-16
Æ
v
a
r
Arnfj
ö
r
ð
B
j
armason
perl/Ma
k
efi
l
e: in
s
tall
Git:
:
I18
N
u
nd
e
r NO_PERL
_
MAK
E
MAKER
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
U
p
dat
e
draft
r
elease notes to 1
.
7
.
10
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-16
Junio
C Ham
a
no
Merge br
a
nch
'
t
h/mergetools-del
t
awalker'
commit
|
commitdiff
|
tree
2012-03-16
Jun
i
o
C Hamano
Merge branch 'jc/ma
i
nt-verify-objects-remove
-
pessim
i
sm'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hama
n
o
Mer
g
e
b
ra
n
ch 'sl/custom
i
ze-
s
ane-tool-p
a
th'
commit
|
commitdiff
|
tree
2012-03-16
Ju
n
io C Hamano
M
er
g
e "two fixes fo
r
fa
s
t-i
m
port's 'ls'
comma
n
d
"
fro
m
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Ju
n
io C Hamano
Merge bra
n
c
h
'
t
h/
g
it-dif
f
all'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge bran
c
h
'th/doc-diff-s
u
bmodule-option'
commit
|
commitdiff
|
tree
2012-03-15
J
unio C H
a
mano
fe
t
ch/recei
v
e
: remove o
v
er-pessimistic connecti
v
ity
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Tim
H
enig
a
n
Document
a
t
i
o
n/diff
t
ool
:
a
d
d deltawalke
r
to lis
t
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herl
a
nd
notes-merge: Don't remove
.
git
/
NOTES_MERGE_WORK
T
R
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
Johan Herland
note
s
-merge:
u
s
e
op
e
ndir/readdir
inste
a
d
of using read_
d
irec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an He
r
l
a
nd
t331
0
: illustr
a
te failure to "no
t
es me
r
ge --commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-15
J
u
ni
o
C Ham
a
no
remove_di
r
_recursiv
e
ly(): Add fl
a
g
f
o
r
ski
p
ping removal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Junio C H
a
mano
Gi
t
1
.
7
.
10
-
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim H
e
nigan
con
t
rib/dif
f
all: fix cle
a
nup trap
o
n
W
i
n
dows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
c
o
nt
r
ib
/
diffall: eliminate d
u
pl
i
c
ate while loops
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Ti
m
Henigan
contrib/diffall: eliminate
use of tar
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim Heni
g
an
cont
r
ib/diffall: cre
a
t
e
tmp di
r
s without m
k
temp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim Heniga
n
contrib/diffall: comment actual rea
s
on for 'c
d
up'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Thomas Rast
diff: tweak a
_
copy_ of diff_options with
w
ord
-
diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
T
ho
m
as
R
ast
diff: re
f
actor the word-diff setup from
built
i
n_di
f
f_cmd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
J
ohanne
s
Sixt
t
4034: diff
.
*
.
wordreg
e
x sh
o
u
l
d
n
ot be "s
t
ick
y
" in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
Do
c
u
m
entatio
n
/d
i
f
f
-optio
n
s: reword
d
escrip
t
ion of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-13
Junio
C Ham
a
no
Merge bran
c
h 'jc/i18n-shel
l
-script-gettext'
commit
|
commitdiff
|
tree
2012-03-13
Junio C
H
a
m
ano
Merge branch 'jc/maint-
u
ndefin
e
d
-i18n-observation-test'
commit
|
commitdiff
|
tree
2012-03-13
Jun
i
o C H
a
mano
Merge branch 'ms/
m
aint-config-error-a
t
-eol-linecount
'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hamano
Merge bran
c
h
'ph/rer
e
r
e
-doc'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Haman
o
am:
of
f
iciall
y
deprecate -b/--binary optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Junio C H
a
mano
Update dra
f
t
release n
o
tes to
1
.
7
.
10 before -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Haman
o
Merge branch 'az
/
verify-tag-use-gpg
-
config'
commit
|
commitdiff
|
tree
2012-03-12
J
u
nio C Hamano
Sync wi
t
h 1
.
7
.
9
.
4
commit
|
commitdiff
|
tree
2012-03-12
J
unio C Hamano
Git 1
.
7
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-03-12
Jun
i
o C Hamano
Merge bran
c
h '
t
r/mai
n
t-bu
n
dle-boundary' int
o
maint
commit
|
commitdiff
|
tree
2012-03-12
J
u
n
i
o C H
a
mano
Merge
b
ranc
h
'j
c
/ma
i
nt-diff
-
pa
t
ch-header' into ma
i
n
t
commit
|
commitdiff
|
tree
next