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 'jk/rebase-i-submodule-conflict-only'
2012-03-26
Stef
a
no Latt
a
rini
configure
:
move definitio
n
s
o
f private m4 macros befo
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Rod
r
ig
o
Silva (Me
s
t
r
.
.
.
Doc
u
menta
t
ion: improve des
c
r
i
p
t
ion of G
I
T_EDITOR and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
Nelson Benit
e
z L
e
on
documentation: fix alphab
e
t
ic ordered list for git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-26
René Scharfe
combi
n
e-diff: fix loop ind
e
x underfl
o
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-24
J
u
nio C Hamano
Merge gi
t
k changes from Paul Mackerras at git://
o
zlabs
.
.
.
commit
|
commitdiff
|
tree
2012-03-23
J
u
nio C H
a
man
o
G
i
t 1
.
7
.
10-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Ju
n
io
C
H
a
m
a
n
o
.
mailmap: unify various old mail addresses of gitster
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
M
e
rge
b
ra
n
ch '
a
m/completio
n
-zsh-fi
x
'
commit
|
commitdiff
|
tree
2012-03-23
Junio C Hamano
Mer
g
e br
a
nch 'dw/gi
t
web-doc-grammo'
commit
|
commitdiff
|
tree
2012-03-23
Je
f
f King
merge-recursive: don't dete
c
t renames of empty f
i
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Jeff King
tea
c
h
diffcore-rename to opti
o
nally
ignore empty content
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Jeff King
make
i
s_
e
mpty
_
blob_sha1 available ever
y
where
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
Jeff King
drop
c
asts from us
e
rs
EMPTY_TREE_SHA1_BIN
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-23
D W
a
i
tzman
Do
c
ume
n
tation/gitweb:
t
rivial English fi
x
e
s
commit
|
commitdiff
|
tree
2012-03-21
Alex Merry
contrib
/
completion
:
"
local var=()" is misinte
r
preted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
J
u
nio C Hamano
Mer
g
e br
a
nch
'maint
'
commit
|
commitdiff
|
tree
2012-03-20
J
u
ni
o
C H
a
m
ano
Merge br
a
n
ch
'
m
a
int-1
.
7
.
8' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2012-03-20
Juni
o
C
Hamano
merge: backport GIT_
M
ERGE_
A
UTOEDIT
s
u
pp
o
rt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
Merge branc
h
'
k
s/sort-wildc
a
rd-in-makefile' into maint
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
J
unio C H
a
mano
Merg
e
br
a
nch 'jc/
a
dv
i
se-i18n' in
t
o maint-1
.
7
.
8
commit
|
commitdiff
|
tree
2012-03-20
Ju
n
i
o
C
H
a
m
a
no
Merge b
r
anch 'jn/gitweb-unspec
i
fied-action' into m
a
i
nt
.
.
.
commit
|
commitdiff
|
tree
2012-03-20
Junio C Hamano
rebase -
i
: remind that
the lines a
r
e top-to-botto
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-20
Christop
h
er
Ti
w
ald
push: Provide si
t
uational hints for non-fast-forward
.
.
.
Based-on-patch-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d Aguilar
t78
0
0: Test difftool passing
argument
s
to
d
iff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge bran
c
h
'
a
b
/per
l
-i18n
'
commit
|
commitdiff
|
tree
2012-03-16
Ævar Arnfjörð Bjarmason
perl/Makef
i
le
:
inst
a
ll
Git::I18N und
e
r NO_
P
ERL_MAKEMA
K
E
R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-16
Junio
C Hamano
Update 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
Junio C
H
amano
Merge branch 'th/m
e
rgetools-deltawalker'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge br
a
nch 'jc/maint-ver
i
fy-objects-remo
v
e-pessimism'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Haman
o
Merge bra
n
ch 'sl/customi
z
e-sane-
t
oo
l
-path'
commit
|
commitdiff
|
tree
2012-03-16
Ju
n
io
C
Hamano
Merge "t
w
o
fixes for fast-impor
t
's 'ls' comman
d
"
f
rom
.
.
.
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
M
e
r
g
e br
a
nch 'th
/
git-diffall'
commit
|
commitdiff
|
tree
2012-03-16
Junio C Hamano
Merge branch 'th/doc-diff-submodule-option'
commit
|
commitdiff
|
tree
2012-03-15
Junio C Hamano
fetch/re
c
eive: remov
e
over-pessi
m
istic connectivity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Tim Heniga
n
Docume
n
tation/diff
t
ool:
a
dd
d
eltawal
k
e
r to list of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Junio C Hamano
cle
a
n: preserve nested git worktre
e
in subdirectories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herland
not
e
s-merge: Don'
t
remove
.
git/NOTES_M
E
RGE_WORKTREE
.
.
.
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
n
o
tes-merge: use opendi
r
/rea
d
dir
ins
t
e
ad of usin
g
rea
d
_
d
i
r
e
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herlan
d
t3
3
10: illustrate failure
to "notes merge --c
o
mmit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Juni
o
C
Hamano
remove_d
i
r_recur
s
ivel
y
(): Add flag for
skippi
n
g removal
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Zbig
n
iew Jędrzejew
s
k
.
.
.
t0303: r
e
surrect commit messa
g
e as test documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-15
Zbign
i
ew J
ę
drzejewsk
.
.
.
t0303: im
m
ediately bail out
w/o G
I
T_TE
S
T_CREDENT
I
AL_HEL
P
ER
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Juni
o
C
H
amano
Git 1
.
7
.
10-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim H
e
n
igan
cont
r
ib/diffall: fi
x
cleanup trap on Wind
o
ws
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
T
im
H
e
n
i
g
an
c
ontrib/dif
f
all: elimin
a
te duplicate while loops
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
T
i
m Henigan
contr
i
b/diffal
l
: eliminate use of tar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Henigan
co
n
trib
/
diffall: create tmp dirs without mktemp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim Heni
g
a
n
contrib/diff
a
ll: comment
a
ctual re
a
s
on
for
'cdup'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Thomas R
a
st
diff: tweak a _cop
y
_ of dif
f
_opti
o
ns with word-diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Thomas Rast
diff: ref
a
ctor th
e
wo
r
d-diff s
e
tup fro
m
builtin_diff_cmd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
J
o
hannes Six
t
t4034:
diff
.
*
.
wordregex s
h
ould not be "
s
t
ic
k
y
" in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Tim H
e
n
iga
n
Documentation/
d
i
f
f-options: reword
d
escription
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-14
Junio C Haman
o
fmt-mer
g
e
-
ms
g
: sho
w
those involved in a merged series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Jonathan N
i
e
d
er
dif
f
stat summary line varie
s
by local
e
:
m
iscellany
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Jonathan Nieder
test: use numstat instea
d
o
f
diff
s
t
at in binary-diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Jona
t
han Nieder
t
est: use --numstat i
n
s
t
ead of --stat i
n
"git stash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Jonathan Nieder
test: test cherry-p
i
ck functionality and output separate
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Jonathan
Nieder
test
:
modernize
f
unny-names test style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Jon
a
than Nie
d
er
test: us
e
numstat instead of di
f
fstat
i
n funny-
n
ames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Jo
n
ath
a
n
Nieder
t
e
s
t
:
use test_i
1
8ncm
p
when checkin
g
-
-
sta
t
output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-13
Ju
n
io C
H
amano
Merge b
r
anc
h
'jc/i18n-shell-
s
c
ript
-
gettext'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Hamano
Merge branch 'j
c
/main
t
-un
d
efin
e
d-i18n
-
o
bser
v
atio
n
-test'
commit
|
commitdiff
|
tree
2012-03-13
Junio
C
Ha
m
a
n
o
M
e
r
ge branch 'ms/maint-config-
e
rror-at
-
eol-linecou
n
t
'
commit
|
commitdiff
|
tree
2012-03-13
Junio C Ha
m
ano
Merg
e
branch 'ph/rerere-doc'
commit
|
commitdiff
|
tree
2012-03-13
Ju
n
io C Hama
n
o
a
m:
o
fficially depr
e
cate
-b/--binary option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Junio C
H
amano
Up
d
ate draft rel
e
as
e
notes to 1
.
7
.
10 before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Ju
n
i
o C Ha
m
ano
Merge branch
'az/verif
y
-tag-u
s
e
-
gpg-config'
commit
|
commitdiff
|
tree
2012-03-12
J
uni
o
C
Hamano
S
ync w
i
t
h 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
Juni
o
C
Hamano
Merge branch 'tr/maint
-
bundle-boundary' into m
a
in
t
commit
|
commitdiff
|
tree
2012-03-12
J
u
nio
C
H
a
mano
Merge branch '
j
c/ma
i
n
t-diff-patch-hea
d
er' into
maint
By
Junio C Hamano
commit
|
commitdiff
|
tree
2012-03-12
Juni
o
C Hamano
M
e
rge branch 'jn/main
t
-do-n
o
t-mat
c
h
-
with-unsan
i
tized
.
.
.
commit
|
commitdiff
|
tree
2012-03-12
Junio
C H
a
mano
Merg
e
branch 'jc/am-3-n
o
nstand
a
rd-popt' into maint
commit
|
commitdiff
|
tree
2012-03-12
Th
o
mas Rast
git-am: er
r
or out when see
i
ng -b/-
-
binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
u
n
i
o C Ha
m
ano
i
1
8n
:
fi
x
au
t
o
detection
of gettext scheme for shell
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
Martin Stenberg
config
:
report errors at the EOL with corr
e
c
t li
n
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-12
J
unio C Haman
o
Merge http
s
://
g
ith
u
b
.
c
om
/
git-l10n/gi
t
-po
commit
|
commitdiff
|
tree
2012-03-11
Junio C Ha
m
ano
com
m
it: pass aut
h
or/commi
t
ter
info to hooks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-11
J
unio C Hamano
t
7
5
03: doe
s
pr
e
-commit-hook
l
earn
authorship?
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-11
Jun
i
o C Hamano
ident
.
c: add split_
i
dent_line()
t
o parse formatted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-10
Ævar
A
rnfjörð Bjarm
a
son
Git::I18N: compatibi
l
i
t
y with
p
e
rl <5
.
8
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-09
Junio C Ha
m
ano
t0204: clarify the "
o
bserve undefined behaviour" tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-09
Stefano L
a
ttarini
configur
e
:
allow user to pre
v
e
n
t $PATH "sanit
i
z
ation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-09
T
h
omas
R
a
s
t
p40
0
0: use -3000 wh
e
n promis
i
ng -3000
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Phil
H
ord
rerere: Document
'
rerer
e
rema
i
ni
n
g'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Alex Zepeda
verify-tag: Par
s
e
G
PG
c
onfig
u
r
a
tion
o
p
tion
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
J
uni
o
C Hama
n
o
Up
d
ate
draft re
l
eas
e
no
t
es to
1
.
7
.
10
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Junio C Haman
o
Merge bra
n
ch 'kb/m
a
int
-
prune-rmdir-clos
e
d
ir'
commit
|
commitdiff
|
tree
2012-03-08
Junio
C Hamano
Merge
b
ranc
h
'jl/maint-submodule
-
relative'
commit
|
commitdiff
|
tree
2012-03-08
J
u
nio C
Hamano
Merge
b
ra
n
ch '
j
n
/maint-do-
n
ot-match-wit
h
-
u
n
sanitize
d
.
.
.
commit
|
commitdiff
|
tree
2012-03-08
Junio
C
Hamano
Merge branch 'vr/bran
c
h-doc'
commit
|
commitdiff
|
tree
2012-03-08
Thoma
s
Rast
perf: export some important
test-lib variab
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-08
Thom
a
s Rast
p
e
rf: load test-lib-funct
i
ons from
t
he
c
orrect
d
irectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-07
Junio C Hamano
Git 1
.
7
.
10-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-07
Junio C Haman
o
Merge
b
ranch 'jc/pickaxe-ignore-case'
By
Junio C Hamano
(2) and Ramsay Jones (1)
commit
|
commitdiff
|
tree
2012-03-07
Karsten Blees
fix deleti
o
n of
.
git/
o
bjects s
u
b-directo
r
ie
s
in
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-07
Nguyễn Thái Ngọc Duy
update-server-in
f
o: respect
c
ore
.
b
ig
f
ilethr
e
sh
o
ld
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-07
Nguyễn Thái N
g
ọc Duy
fsc
k
: use
stre
a
ming API
f
or writing lost-fou
n
d
b
lobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-07
Ng
u
yễn Th
á
i Ngọ
c
Duy
show: use streaming API
f
or showi
n
g blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-03-07
Nguyễ
n
Thái Ngọc Duy
parse_object:
a
v
oid putting whole blob in core
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next