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 branch 'jk/prompt-stash-could-be-packed' into jch
2014-08-25
J
u
nio C Hamano
Mer
g
e b
r
a
n
ch 'jk/pr
o
mp
t
-stas
h
-c
o
uld-
b
e
-
packed'
i
nt
o
j
ch
commit
|
commitdiff
|
tree
2014-08-25
Junio
C
Hamano
Merge branch 'r
s
/list-
o
ptim' i
n
to jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C Haman
o
Merg
e
b
ranch
'
sp/st
r
eam-cl
e
an-
f
i
l
ter' in
t
o jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C Hamano
Merge br
a
nch 'et
/
spell-p
o
ll-in
f
i
n
ite-with-minus-one
.
.
.
commit
|
commitdiff
|
tree
2014-08-25
Junio C Ham
a
no
Merge bran
c
h '
b
r
/
imap-send-simplif
y
-tunnel-
c
h
ild-p
r
ocess
.
.
.
commit
|
commitdiff
|
tree
2014-08-25
Junio
C Hamano
M
erge b
r
anch
'
rs/
c
hild-proce
s
s-init' into
j
ch
commit
|
commitdiff
|
tree
2014-08-25
J
unio
C
Hamano
Merge branch 'ta/con
f
i
g-add
-
to-empty-o
r
-tr
u
e
-
fix' int
o
jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C Haman
o
Merge branch '
b
r/http-
i
n
it-fix' into jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C Hamano
M
erge
b
r
an
c
h 'rs/inline-compat-path-macros
'
into jc
h
commit
|
commitdiff
|
tree
2014-08-25
Junio
C Hamano
Merge
branch 'rs/clean-menu-item-defn' into jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C
H
amano
Merge branch 'jc/con
f
i
g
-mak-document-darwin-vs-macosx
.
.
.
commit
|
commitdiff
|
tree
2014-08-25
Juni
o
C Ha
m
ano
Merge branc
h
'km/
n
o-apple
-
common-crypto
-
on-dar
w
in
-
8
.
.
.
commit
|
commitdiff
|
tree
2014-08-25
Junio C Hamano
Merge branch 'nd/large-blobs' into jch
commit
|
commitdiff
|
tree
2014-08-25
Ju
n
io C Hamano
Merge br
a
nch 'jn/u
n
p
a
c
k
-
trees-
c
heckout-m-carry-d
e
l
e
tion
.
.
.
commit
|
commitdiff
|
tree
2014-08-25
Junio C Haman
o
Me
r
g
e
b
r
anch '
j
k
/pack-bit
m
a
p' into jch
commit
|
commitdiff
|
tree
2014-08-25
Juni
o
C Hamano
Merge
branch
'rs/ref-trans
a
ct
i
on-mult
i
' into jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C Hamano
Merge
branch '
r
s/ref-transac
t
ion-rename'
i
nto jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C Hamano
Merge
b
ranch
'
rs/ref-t
r
ansaction-reflo
g
'
into jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C Ha
m
ano
M
erge branch 'po/eve
r
yd
a
y
-
doc' into jch
commit
|
commitdiff
|
tree
2014-08-25
Juni
o
C H
a
mano
M
erge branc
h
'jc/not-ming
w
-cygwin' into
j
ch
commit
|
commitdiff
|
tree
2014-08-25
J
u
n
io C Haman
o
Merge branch 'c
b
/mergetool-difftoo
l
' into jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C Hamano
Me
r
ge branch
'
cc/i
n
terp
r
et-
t
ra
i
lers' into
jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C
Hamano
Merge
branch 'mt/patch-id-stable' into jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C Ha
m
ano
Merg
e
b
ranch
'
j
c
/
test-laz
y
-prereq' int
o
jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C Hamano
M
erge b
r
anch 'rs/ref-
t
ra
n
saction' i
n
to
j
ch
commit
|
commitdiff
|
tree
2014-08-25
Junio C Hamano
Mer
g
e branch 'rs/ref-tra
n
saction-
1
'
in
t
o jc
h
commit
|
commitdiff
|
tree
2014-08-25
J
u
nio C Hamano
Me
r
ge
b
ranc
h
'ta/config-set-2' into jch
commit
|
commitdiff
|
tree
2014-08-25
J
u
nio C H
a
ma
n
o
Merge
b
ranch 'ta/config
-
set-
1
' i
n
to j
c
h
commit
|
commitdiff
|
tree
2014-08-25
Junio
C Hamano
Merge branc
h
's
o
/r
e
base-doc' in
t
o
jch
commit
|
commitdiff
|
tree
2014-08-25
Junio C H
a
mano
Merge branch 'sb/prepare-re
v
i
s
i
on-walk-error-che
c
k
.
.
.
commit
|
commitdiff
|
tree
2014-08-25
J
u
nio C
H
a
mano
Merge
b
ranch 'sb/b
l
ame-msg
-
i18n' into jch
commit
|
commitdiff
|
tree
2014-08-25
Ju
n
io C Hamano
M
e
rge branch 'n
d
/
s
t
rbuf
-
utf
8
-replace' into jc
h
commit
|
commitdiff
|
tree
2014-08-25
Jun
i
o C Ham
a
n
o
Merge b
r
a
n
ch 'nd/mv-
c
ode-cleani
n
g' into
jch
commit
|
commitdiff
|
tree
2014-08-25
Junio
C H
a
mano
Merge branch 'sb/
p
lug-leaks' into jch
commit
|
commitdiff
|
tree
2014-08-25
Jeff King
git-pro
m
pt: do not
loo
k
for refs/stash in $GIT_DI
R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-25
René
S
charfe
walker:
avoid q
u
ad
r
atic list i
n
sertion in
m
a
r
k
_co
m
plete
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-25
Re
n
é Scharfe
sha1_name: avoid quadrat
i
c
lis
t
in
s
e
rtio
n
in handl
e
_one_r
e
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-22
Ed
w
ard Thomson
u
pload-pack:
k
e
e
p
p
oll(2)'s timeou
t
to -1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-22
Stef
f
en
P
rohas
k
a
conv
e
rt
:
stream from f
d
t
o
req
u
i
red cle
a
n filt
e
r instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-22
Steffen Pr
o
hask
a
memory_limit_ch
e
ck(): al
l
ow
a limit th
a
t do
e
s not fit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-22
Stef
f
en Prohaska
sha1
_
file
.
c: introd
u
ce GIT_MMAP_LIMIT to
l
imit m
m
ap
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-21
S
teff
e
n P
r
oh
a
sk
a
convert
:
drop
arguments other than 'path' fro
m
woul
d
_
c
onvert
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-21
Junio C Hamano
Merge br
a
nch 'rs/refresh-bey
o
nd-symlink' into
j
ch
commit
|
commitdiff
|
tree
2014-08-21
Junio C Hamano
Merge bra
n
ch 'tf/imap-send-create
'
into
j
ch
commit
|
commitdiff
|
tree
2014-08-21
Jun
i
o C Hamano
Merge bran
c
h 'la
/
init-doc' into jch
commit
|
commitdiff
|
tree
2014-08-21
Ju
n
io C
Hama
n
o
Merge branch 'j
k
/stash-lis
t
-p' into jch
commit
|
commitdiff
|
tree
2014-08-21
Junio C Ha
m
ano
Merge b
r
anch
'
mm/log-b
r
anch-desc-pl
u
g
-
leak' into j
c
h
commit
|
commitdiff
|
tree
2014-08-21
Junio C
Hama
n
o
Mer
g
e b
r
anch 'lf/bundle-e
x
clusion' in
t
o jch
commit
|
commitdiff
|
tree
2014-08-21
Junio C Ha
m
ano
Merge branch 'jc/apply-
w
s-pr
e
fix'
into jch
commit
|
commitdiff
|
tree
2014-08-21
Junio C Ham
a
no
Merg
e
br
a
nch 'jk/command-line-
c
onfig-emp
t
y-stri
n
g'
.
.
.
commit
|
commitdiff
|
tree
2014-08-21
Junio C
H
a
mano
Mer
g
e br
a
nch
'
b
c/imap-send-doc' in
t
o jch
commit
|
commitdiff
|
tree
2014-08-21
Ju
n
io C Ha
m
ano
### match next
commit
|
commitdiff
|
tree
2014-08-21
Junio
C Haman
o
M
e
r
ge
b
ranch 'nd/multiple-work-trees-1' i
n
to jch
commit
|
commitdiff
|
tree
2014-08-21
Jun
i
o
C Hamano
Merge branch 'nd/
m
ultiple
-
work-tree
s
'
i
n
t
o jch
commit
|
commitdiff
|
tree
2014-08-21
Junio C
Ham
a
n
o
Merge b
r
anch
'
t
a
/
p
re
t
ty-pars
e
-config'
i
n
to jch
commit
|
commitdiff
|
tree
2014-08-21
Junio C Hamano
Merge br
a
nch 'bc/archive-pax-he
a
der-mode' int
o
jch
commit
|
commitdiff
|
tree
2014-08-21
J
u
nio C Hamano
M
e
rge
branch 'pr/re
m
otes-
i
n-hashmap
'
into jch
commit
|
commitdiff
|
tree
2014-08-21
J
uni
o
C Hamano
Merge branch 'jk/pretty-e
m
pty
-
format' int
o
jch
commit
|
commitdiff
|
tree
2014-08-21
Junio C
H
amano
M
e
r
g
e
branch 'ta/config-se
t
'
i
nto
jc
h
commit
|
commitdiff
|
tree
2014-08-21
Junio C Haman
o
M
e
r
g
e
branc
h
'rs/init-no-du
p
licate-real-path'
i
n
to jch
commit
|
commitdiff
|
tree
2014-08-21
Junio C Ham
a
no
Merge bran
c
h 'mm/
c
onfig-
e
dit-global'
i
n
t
o
jch
commit
|
commitdiff
|
tree
2014-08-21
Junio C H
a
m
ano
Merge
b
ranch 'r
s
/strbuf
-
getcwd' into
jch
commit
|
commitdiff
|
tree
2014-08-21
Jun
i
o C Hamano
Mer
g
e branch 'dt/c
a
che-tree
-
repair' into
j
c
h
commit
|
commitdiff
|
tree
2014-08-21
Junio C Haman
o
Merge
bra
n
ch 'jc/reo
p
e
n
-lock-f
i
le' into
jch
commit
|
commitdiff
|
tree
2014-08-21
Junio C Hamano
Merge branc
h
'h
v
/submodule-confi
g
' into
j
ch
commit
|
commitdiff
|
tree
2014-08-21
J
unio C Haman
o
Merge
b
ranch 'jk/diff-tre
e
-
t-fix' in
t
o jch
commit
|
commitdiff
|
tree
2014-08-21
Junio
C
Hamano
Merge b
r
a
n
ch 'jk/pack-
s
h
a
llow-always-without-bitmap
.
.
.
commit
|
commitdiff
|
tree
2014-08-21
Junio C Hamano
Merge bran
c
h 'jk/fix
-
profile-feedback-bu
i
ld' into jch
commit
|
commitdiff
|
tree
2014-08-21
Jeff Kin
g
http: style fixes
f
or curl_mul
t
i_init
e
rror che
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-20
Jef
f
King
i
ntersect_path
s
:
respec
t
mode
i
n
git's tre
e
-
sort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-20
Bernha
r
d
Rei
t
er
im
a
p-send
.
c: i
m
ap
_
folder
-> imap_s
e
rve
r
_conf
.
f
o
lder
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-20
René
Scharf
e
r
u
n
-
command: inline prepare_run_command_v_opt()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-20
René Scha
r
fe
run-
c
omm
a
nd
:
cal
l
run_
c
o
m
man
d
_v_opt_cd_env() in
s
tea
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-20
R
e
né Scha
r
fe
r
u
n-command: intr
o
duce child_process_init()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-20
R
e
né
S
c
h
arfe
run-command: introduce CHILD_P
R
OCESS_INIT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-19
Jeff King
Makefi
l
e:
mak
e
perf tests op
t
io
n
al
for pr
o
file build
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-18
Tanay Abhra
make confi
g
-
-
a
dd behave c
o
rrectly for empty and NULL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-18
Nguy
ễ
n Thái N
g
ọc D
u
y
diff: sho
r
tcut for diff'ing
tw
o
b
i
n
ary SHA-1 objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-18
Nguy
ễ
n
T
hái
Ngọc Duy
d
i
f
f
--stat: mark any file larger than core
.
bigfilethreshold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-18
Nguyễn Thái Ngọc D
u
y
diff
.
c: allow to pas
s
more flags to diff_
p
opulate_f
i
lespec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-18
Nguyễn T
h
ái Ngọc Duy
s
h
a
1
_file
.
c: do not die failing
t
o
malloc in unpack_compr
e
ss
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-18
Ng
u
yễn
Thái Ngọc Duy
wrapp
e
r
.
c:
i
n
t
roduce ge
n
tle xmallocz that does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-18
Bernh
a
rd
R
eite
r
g
it-imap-s
e
nd: si
m
plify
t
unnel construc
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-18
B
e
r
nha
r
d R
e
iter
http
.
c:
d
ie if curl_
*
_init fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-18
Re
n
é Sch
a
rfe
turn path macr
o
s
i
nt
o
i
nline fu
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-18
Junio C Hamano
fixup
!
setup:
c
o
nvert s
e
tup
_
git_directory_gently_1
.
.
.
commit
|
commitdiff
|
tree
2014-08-18
R
e
né
S
c
h
arfe
c
l
ean: use f(void) instead of f
(
) to decla
r
e a pointer
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-15
Junio C Hamano
Git 2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-15
J
u
ni
o
C Ham
a
no
config
.
mak
.
una
m
e
: add hint on
u
name_R for MacOS X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-15
Kyle J
.
M
cKay
config
.
mak
.
uname: set NO
_
APP
L
E_COMMO
N
_CR
Y
PTO on
older
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-13
Johannes Sixt
tests
:
fix negate
d
test_i18ngrep calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-13
Jun
i
o C H
a
man
o
SQUASH???
commit
|
commitdiff
|
tree
2014-08-13
Ta
n
ay Abhra
built
i
n/apply
.
c: replace `git_config()` with
`
g
it_config_get
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-13
Tanay Abh
r
a
merge-recursive
.
c: replac
e
`git_con
f
ig
(
)`
wi
t
h `git_config_g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-13
Ta
n
ay Abhra
ll-merg
e
.
c: refactor
`rea
d
_merge_config()` to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-13
T
anay Abhra
fas
t
-impor
t
.
c: replac
e
`git_
c
onfig()` with `git_
c
onfig_get_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-13
J
o
na
t
han Niede
r
checko
u
t -m: attempt merge w
h
en
d
eletion
o
f path was
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-13
Jonat
h
an Nieder
unpack-tree
s
: use
'
cuddled' st
y
le f
o
r if-else ca
s
cade
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-13
Stefan
B
eller
un
p
ack-trees: sim
p
lify 'al
l
other failure
s
' case
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-08-12
Sergey Organov
Documenta
t
ion/git-rebase
.
txt: -f forces a rebase that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next