repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge overwrites unstaged changes in renamed file
2012-04-16
Clemens Bucha
c
her
merge overwrites unstaged changes in ren
a
med file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Junio C Haman
o
Kick off
p
ost 1
.
7
.
1
0
c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-11
Se
b
astian Pi
p
ping
gitweb:
Fix unint
e
nde
d
"
-
-no-merges"
for regular
A
tom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
Ju
n
io
C
Hamano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2012-04-10
Ju
n
io C H
a
mano
Merge branc
h
'ma
i
nt-1
.
7
.
9' into
maint
commit
|
commitdiff
|
tree
2012-04-10
Junio
C
H
a
man
o
Merge branch 'maint-1
.
7
.
8'
into ma
i
nt-1
.
7
.
9
commit
|
commitdiff
|
tree
2012-04-10
René Scharfe
test-s
u
bp
r
oc
e
ss: fix segfault without argum
e
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-10
R
ené Scha
r
fe
submod
u
le: fix prototyp
e
of gitmodu
l
es_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-09
Junio C Haman
o
M
erge
b
r
anch
'
jc/maint-verify-
o
b
j
ects
-
remove-pes
s
imism
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Ju
n
io C H
a
mano
Merge branc
h
'dw/
g
itweb-do
c
-grammo'
i
n
t
o main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Mer
g
e
branch
'
tr/cache-tree' into
m
a
int
-
1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Juni
o
C Hamano
M
e
rg
e
b
r
a
n
ch '
c
b
/main
t
-t5541-ma
k
e-server-p
o
rt-port
a
ble
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio
C
Hamano
M
e
rge br
a
n
c
h
'
cn/m
a
int-rev-list-doc'
i
nto main
t
-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-09
Junio C
H
amano
Merge bran
c
h
'tr
/
maint-bund
l
e-
b
oundary
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C Hamano
Merge branch 'tr
/
maint-bundle-l
o
ng-su
b
ject'
i
nt
o
maint
.
.
.
commit
|
commitdiff
|
tree
2012-04-09
Junio C
Hamano
Merge
b
r
a
n
c
h
'ph/rer
e
re-doc'
into
mai
n
t-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-04-06
Junio
C Hamano
Git 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-06
Felipe Contrera
s
spec
:
add m
i
s
sing build dep
e
nd
e
ncy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-03
J
unio C
Hamano
Git 1
.
7
.
1
0
-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Ham
a
no
Merge branch 'pt/gitk'
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hama
n
o
Sync with
1
.
7
.
9
.
6
commit
|
commitdiff
|
tree
2012-04-02
Junio C H
a
m
a
no
Git 1
.
7
.
9
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Junio C Hamano
Me
r
ge bran
c
h 'jc/main
t
-
merge-
a
u
toedit
'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-04-02
Pat Thoyts
gi
t
k: fix setting font dis
p
lay with
n
ew tab
b
ed dialog
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Pat Thoyts
gitk: fix tabbed
preferences constr
u
cti
o
n wh
e
n using
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-04-02
Ju
n
io C Hamano
Merge git://github
.
com
/
git-l10n
/
git-po
commit
|
commitdiff
|
tree
2012-03-31
J
unio C Hamano
Merge
b
ra
n
ch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2012-03-30
Heiko
Voigt
string-
l
ist:
d
ocument that
s
t
ring_list_i
n
sert() inserts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
René Scharfe
config: rem
o
ve u
s
eless
a
s
signment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Junio C
Hamano
G
it 1
.
7
.
10-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim Meyeri
n
g
correct
a
f
e
w doubled-word nits in comments and docum
e
nta
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-28
Jim
M
eyering
correct
spelling:
an URL -> a URL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-27
Junio C Hamano
l10n
u
pda
t
es f
o
r
Git 1
.
7
.
10-rc1
commit
|
commitdiff
|
tree
2012-03-27
Z
bigniew Ję
d
rzejewsk
.
.
.
tes
t
s: unset COLU
M
NS inherited f
r
om
e
n
viro
n
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Update d
r
a
f
t release no
t
es
t
o 1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Junio
C
Hamano
Sync 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
Ju
n
io C Hama
n
o
M
erge branc
h
'jn/
m
aint-fa
s
t-import-empty-ls' int
o
maint
commit
|
commitdiff
|
tree
2012-03-26
Junio C Hamano
Me
r
ge branch 'ph/rerere-doc'
i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2012-03-26
Junio
C Hamano
M
erge branch '
m
s/maint-config-error-at-eol-linecount
.
.
.
commit
|
commitdiff
|
tree
2012-03-26
M
ar
k
L
o
da
t
o
gr
e
p d
o
c: add --break / --heading / -W
to synopsis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rod
r
ig
o
S
i
lva (Mest
r
.
.
.
Documentatio
n
:
i
m
p
rove descript
i
on of GIT_
E
DITO
R
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
N
e
l
s
on Be
n
ite
z
Le
o
n
doc
u
mentation: fix alphabetic o
r
dered li
s
t
f
o
r git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-24
Junio C Hamano
Merg
e
g
i
t
k
ch
a
nges from
P
aul Mackerras at
g
it://
o
zlabs
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
Junio C H
a
mano
Git 1
.
7
.
10-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
J
unio C Hamano
.
mailm
a
p: uni
f
y
various old m
a
il addresses o
f
gitster
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
J
u
nio C Ham
a
no
M
e
rge b
r
anch 'am/com
p
l
e
tion-zsh-fix'
commit
|
commitdiff
|
tree
2012-03-23
Ju
n
io
C Haman
o
Merge bra
n
ch '
d
w/gitweb-doc-grammo'
commit
|
commitdiff
|
tree
2012-03-23
D Waitzman
Documen
t
ation/gitweb: trivia
l
English fixes
commit
|
commitdiff
|
tree
2012-03-21
Alex Merry
c
o
ntrib/com
p
letion: "lo
c
al var=()" is
misinte
r
preted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Haman
o
Mer
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
i
o
C
H
amano
M
erge branch 'ma
i
nt-1
.
7
.
8'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
merge: b
a
ckport
GIT
_
MERGE
_
AUTOEDIT support
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branch 'k
s
/
sort-wil
d
card-in-m
a
kefile
'
in
t
o
m
a
int
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hama
n
o
Merge branch 'jc/ad
v
ise-i18n' into maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
J
u
n
i
o
C Hama
n
o
Merg
e
branch
'
j
n
/gitweb-
u
nspe
c
ifi
e
d-actio
n
' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio C H
a
mano
Merg
e
branch
'
ab/perl-i18n'
commit
|
commitdiff
|
tree
2012-03-16
Ævar Arnfjörð Bjarmas
o
n
perl/Makefile:
i
ns
t
all Git:
:
I18N under NO_PERL_MAKEMAKER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Ju
n
io
C
H
a
ma
n
o
Upd
a
te draft release
n
otes to 1
.
7
.
1
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Junio C
H
a
mano
Merge branch 'th/mergeto
o
ls-del
t
aw
a
lker'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge branc
h
'jc/maint-
v
erify-obje
c
ts-remo
v
e-
p
essimism'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
M
erge bra
n
ch 'sl/customize-s
a
ne
-
t
ool-path'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hama
n
o
Merge "t
w
o fixes for fast-import's 'ls' command" from
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio
C
Hamano
Mer
g
e branch 'th/git-diff
a
ll'
commit
|
commitdiff
|
tree
2012-03-16
Jun
i
o C Hamano
Me
r
ge branch
'th/doc-d
i
ff
-
subm
o
d
u
le-o
p
tion'
commit
|
commitdiff
|
tree
2012-03-15
Junio
C Hamano
fetch/receive: remove ove
r
-pessimist
i
c
c
onnect
i
vity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Ti
m
Heni
g
an
Docu
m
entat
i
on/
d
iff
t
ool: add deltawa
l
ker to list of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Junio
C
Haman
o
Git
1
.
7
.
10-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
contrib/diffall:
f
ix clean
u
p trap on
W
indows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henig
a
n
contrib/diffall: eliminate duplicate wh
i
le loops
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
T
i
m
H
enigan
c
ont
r
ib/diffall: eliminate
use of tar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim
H
enigan
c
o
ntrib/diffall: cre
a
te
t
m
p dirs witho
u
t mkt
e
mp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
T
i
m Henigan
contrib/d
i
ff
a
l
l
: comment ac
t
ual reason for 'cdup'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim He
n
igan
Documentati
o
n/diff-opt
i
ons:
reword d
e
scrip
t
ion of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Ju
n
io C Hamano
Merge b
r
anch 'jc/i18n-s
h
ell-s
c
ript-
g
et
t
ext'
commit
|
commitdiff
|
tree
2012-03-13
Junio
C
Hamano
M
e
r
g
e b
r
a
n
c
h
'
jc/maint-u
n
defined-i18n
-
o
b
servation-test'
commit
|
commitdiff
|
tree
2012-03-13
J
u
nio C Hamano
M
e
rge branch
'
ms/maint-c
o
nfig-erro
r
-at-
e
ol-linecount'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hamano
Merge
b
r
anc
h
'ph/rer
e
r
e
-
doc
'
commit
|
commitdiff
|
tree
2012-03-13
Jun
i
o
C Hamano
a
m: officially de
p
r
ecate -b/--binary
op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Update draft
release note
s
to 1
.
7
.
10 before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
unio
C
H
a
mano
Merge
b
r
anc
h
'
az/veri
f
y-tag-use-gpg-config
'
commit
|
commitdiff
|
tree
2012-03-12
Junio C Ham
a
no
Sync w
i
th 1
.
7
.
9
.
4
commit
|
commitdiff
|
tree
2012-03-12
J
u
nio C Hamano
G
i
t 1
.
7
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C H
a
m
a
n
o
Merge
branc
h
'
t
r/maint-bundle-b
o
undary' into maint
commit
|
commitdiff
|
tree
2012-03-12
Junio C
H
amano
Merge branc
h
'jc/main
t
-d
i
f
f-patch-header'
i
nto mai
n
t
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Junio C Haman
o
Merge branch 'jn/maint-do-not
-
match-with-unsanitized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio C Hamano
Merge
b
ranch 'jc/
a
m-
3
-nonstan
d
ard-p
o
pt' into m
a
int
commit
|
commitdiff
|
tree
2012-03-12
Thomas Rast
git-am
:
error out
w
hen seeing -b/--
b
ina
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
u
nio C
H
amano
i
18n:
f
ix
a
u
t
o
detectio
n
of gettex
t
scheme
f
or shell
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Martin Stenberg
c
o
nfig: repo
r
t error
s
at
the EOL with correct line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C H
a
mano
Merge https://github
.
com/
g
i
t-l
1
0n/git-po
commit
|
commitdiff
|
tree
2012-03-10
Ævar Arnfjörð Bja
r
mas
o
n
Git::I1
8
N: compatibility with p
e
r
l <5
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-09
J
u
nio
C
H
ama
n
o
t0204
:
clarify
the "o
b
serve
u
nde
f
ined behaviour" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-09
S
tefa
n
o Latta
r
in
i
configu
r
e: allow user to pr
e
ven
t
$PATH "sani
t
ization
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-09
Th
o
mas Ra
s
t
p4
0
00: use -3000 when p
r
omising -3
0
00
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil
Hor
d
re
r
ere: Document 'r
e
rer
e
remaining'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Alex Zepeda
verif
y
-tag: Parse GPG configur
a
tion options
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Junio C
Ha
m
ano
Up
d
ate
draft rel
e
ase note
s
to
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Junio
C
Hamano
M
erge
branch 'kb/mai
n
t-prun
e
-r
m
dir-cl
o
sed
i
r'
commit
|
commitdiff
|
tree
2012-03-08
Junio C H
a
m
a
no
Merge
b
r
anch '
j
l/maint-submodule-relative'
commit
|
commitdiff
|
tree
next