repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore
2011-11-28
N
guyễn Thái Ngọc Duy
ch
e
ckout,merge: di
s
all
o
w overwriting ignor
e
d files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-28
Junio C Hama
n
o
Merge branc
h
'
n
d
/
m
a
i
n
t-ig
n
ore-exclude'
i
nto nd/ignore
.
.
.
commit
|
commitdiff
|
tree
2011-11-28
Nguyễ
n
Thái Ngọc Duy
ch
e
c
k
out,merge: loosen overwriting un
t
racked file chec
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Jun
i
o C Haman
o
Update
1
.
7
.
8 draft
release
n
otes in prepara
t
ion for
rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Juni
o
C Hamano
M
e
rge branch 'jn/revert-quit'
commit
|
commitdiff
|
tree
2011-11-23
J
on
a
t
h
an Nieder
revert: rem
o
ve --reset
co
m
patibility option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-23
Jonatha
n
Niede
r
r
e
v
e
rt: introduce --abort to can
c
el a f
a
iled cherry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan Nieder
revert: w
r
i
t
e R
E
VERT_HEAD pseudoref duri
n
g con
f
licted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jonathan Nie
d
er
reve
r
t: imp
r
ove error message for
c
her
r
y-p
i
ck during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jonatha
n
Nie
d
er
revert: rear
r
an
g
e pick_
r
e
visions() for
c
lar
i
ty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-22
Jonat
h
an Nieder
revert: rena
m
e --reset option to
-
-
quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Junio C Hamano
Merge
br
a
n
c
h 'm
a
int
'
commit
|
commitdiff
|
tree
2011-11-21
Junio C Hamano
Merge bra
n
ch 'rr/misc-f
i
xes'
commit
|
commitdiff
|
tree
2011-11-21
Ram
s
ay Jones
convert
.
c: Fix return type of git_p
a
th_
c
h
e
ck_
e
ol()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Thomas Hochste
i
n
docu
m
ent
a
tion fix: git d
i
fft
o
ol uses diff
tools, not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Ramsa
y
Jone
s
c
o
nfi
g
.
c
:
Fix a static buff
e
r overwr
i
te bug
by avoid
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-21
Ra
m
say Jones
t
5
501-*
.
s
h: Fix url
p
ass
e
d to clo
n
e in setup
t
e
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Junio C Hama
n
o
Hopefu
l
ly
f
in
a
l update of release notes befor
e
1
.
7
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
J
u
nio C Hamano
M
erge br
a
nch 'rr/misc-fixe
s
'
commit
|
commitdiff
|
tree
2011-11-18
Jonathan Nieder
M
akefile: add option to
d
isa
b
le automatic dependen
c
y
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Ju
n
io C
H
ama
n
o
Sync with 1
.
7
.
7
.
4
commit
|
commitdiff
|
tree
2011-11-18
J
unio C Hamano
G
i
t 1
.
7
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
Junio
C
Hama
n
o
Merge br
a
nch 'jc/ma
i
nt-name-rev-all' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-11-18
Junio
C Hamano
Merge
branc
h
'ml/
m
ailmap' into maint
commit
|
commitdiff
|
tree
2011-11-18
Junio C Hamano
M
erge b
r
anch 'jn/ma
i
nt-note
s
-avoid-va-args' into
m
a
int
commit
|
commitdiff
|
tree
2011-11-18
Jona
t
ha
n
Nieder
Makefile: add
missing header
f
ile dependencies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-18
J
o
nathan N
i
eder
notes merg
e
: eliminate O
U
TPUT
macro
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
Jonathan
N
ied
e
r
do not let git_pat
h
clobber err
n
o
w
hen r
e
port
i
ng er
r
ors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
Junio C Hamano
Git 1
.
7
.
8-rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
Jun
i
o C
H
amano
re
f
s: loosen over-strict "form
a
t" check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-17
Ma
r
c-André L
u
reau
m
ailmap: xcalloc m
a
ilm
a
p
_info
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramku
m
ar
R
amachandra
revert: prettify fa
t
al m
e
ssages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramkumar Ramachandr
a
gi
t
-comp
a
t-ut
i
l
:
don't assume value for u
n
defin
e
d
v
aria
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramkuma
r
Ra
m
achandra
s
ha
1
_file
:
d
on't mix enum
w
ith int
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramkumar Ramac
h
andra
conver
t
: do
n
'
t
m
i
x en
u
m
with i
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-16
Ramkumar Rama
c
handra
http: remove unused functi
o
n hex()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-15
Junio C Ham
a
no
n
a
me
-
r
e
v -
-
all: do not even attempt to descr
i
b
e non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-15
J
u
nio C Hamano
Revert "upload-ar
c
hiv
e
:
use star
t
_command inst
e
a
d of
.
.
.
commit
|
commitdiff
|
tree
2011-11-13
J
unio C
H
ama
n
o
Git 1
.
7
.
8
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-12
Junio
C Hamano
M
erge
b
ranch 'ly/mktree-using-strbuf'
commit
|
commitdiff
|
tree
2011-11-10
Juni
o
C Hamano
Merge "Move 'builti
n
-*' into a 'buil
t
in/'
s
u
bd
i
r
ec
t
ory"
commit
|
commitdiff
|
tree
2011-11-10
Jun
i
o C
Hamano
Merge 'build-
i
n gi
t
-mktree'
commit
|
commitdiff
|
tree
2011-11-10
L
i
u Yuan
mktree: fix a memory leak in
w
rite_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
Junio C Hamano
Merge branch 'sn
/
comple
t
e
-bash-w
o
-process-subst'
commit
|
commitdiff
|
tree
2011-11-09
S
Z
E
DER Gáb
o
r
completi
o
n
:
don't leak
v
ariable from the p
r
ompt i
n
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
Junio C Hamano
Upda
t
e
dra
f
t relea
s
e notes to 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
Junio C Hamano
Merge branch 'j
c
/remo
t
e
-
setbranches-u
s
age-fi
x
'
commit
|
commitdiff
|
tree
2011-11-09
J
u
nio C Ha
m
a
no
Merg
e
branc
h
'fc/remote-se
t
url-usage-fix'
commit
|
commitdiff
|
tree
2011-11-09
Junio C Hamano
S
y
n
c
w
i
t
h 1
.
7
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
Junio
C Hamano
G
i
t
1
.
7
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-09
Junio C Haman
o
Merge bran
c
h 'jc/
m
aint-remove
-
renamed-ref' into ma
i
nt
commit
|
commitdiff
|
tree
2011-11-09
Junio C Hamano
Mer
g
e
branch 'jm/maint-gitweb-filter-forks-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-11-09
Junio
C H
a
ma
n
o
M
er
g
e
bra
n
c
h
'dm/
p
ack-obj
e
cts-update' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-11-08
J
unio C Haman
o
docs:
U
pdate install-d
o
c-quick
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Jeff King
doc
s
: d
o
n't mention --quiet o
r
--exit-code in
git-log(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Junio C Hamano
Git 1
.
7
.
8-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-08
Junio C H
a
mano
Merge branch
'
s
s/blame-textconv-
f
a
k
e-wor
k
ing-tree'
commit
|
commitdiff
|
tree
2011-11-08
S
e
b
astia
n
S
c
huber
t
h
blame
.
c: Properly
i
nitialize strbuf a
f
ter calling textconv_o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
Junio C Hamano
Merge branc
h
'ab/i18n
-
te
s
t-fix'
commit
|
commitdiff
|
tree
2011-11-07
Junio C H
a
man
o
Merge b
r
anch 'sn/h
t
tp
-
auth-with-netrc-fix'
commit
|
commitdiff
|
tree
2011-11-07
Junio C Hamano
M
e
rge branch 'pw/p4-appled
o
uble-fix'
commit
|
commitdiff
|
tree
2011-11-07
Felip
e
Contreras
rem
o
te: fix
r
emote set-url usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-07
J
unio
C Ham
a
n
o
remote: fix set
-
b
ranches usa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-06
P
e
t
e Wycko
f
f
git-p4: ignor
e
appl
e
f
i
lety
p
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-06
Ævar Arnfjörð Bjarmason
t/t75
0
8
-
status
.
sh: use test_i18n
c
mp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-06
Ævar Arnfj
ö
rð Bjarmason
t/t6030-bisect-
p
or
c
elain
.
sh
:
use
t
e
st_i18ng
r
ep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-04
Ste
f
a
n
Naewe
http: don't alwa
y
s pr
o
mpt for password
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-03
Junio C H
a
mano
rece
i
ve-pa
c
k: do not expect
object
0
{40} to exist
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-02
Stefan Naewe
t3
2
00:
add
te
s
t
case for 'branc
h
-m'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-02
T
a
y Ray Chuan
branch -m
:
handle no arg p
r
operly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-01
Junio C H
a
mano
Update draft release n
o
tes to 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-01
J
unio C Ha
m
ano
Sync with
1
.
7
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-01
Junio C Hamano
Git 1
.
7
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-01
Ju
n
i
o C Hamano
M
e
r
g
e
bran
c
h 'rs/maint-e
s
timat
e
-cache-size' into mai
n
t
commit
|
commitdiff
|
tree
2011-11-01
J
unio C Hamano
Me
r
g
e
branch
'
m
d/s
m
t
p-tls-hello
-
aga
i
n' into maint
commit
|
commitdiff
|
tree
2011-11-01
Junio C Ham
a
no
Merge
branch 'jk/
p
u
ll-rebase-with-w
o
rk-tre
e
' into maint
commit
|
commitdiff
|
tree
2011-11-01
Juni
o
C Hamano
M
erge b
r
anch
'
jc
/
ma
i
nt-diffstat-nu
m
stat-context' into
.
.
.
commit
|
commitdiff
|
tree
2011-11-01
Jun
i
o C Ha
m
an
o
M
e
rge br
a
nch '
j
s/
b
isect-no-checkout' into maint
commit
|
commitdiff
|
tree
2011-11-01
Junio C Haman
o
Merge branc
h
'bc/at
t
r-ignore-case'
i
nto maint
commit
|
commitdiff
|
tree
2011-11-01
Junio C Hamano
Mer
g
e br
a
nch 'c
n
/
fetch-
p
rune' into maint
commit
|
commitdiff
|
tree
2011-11-01
Junio
C Hamano
Merge branc
h
'
s
p/smart-http-fai
l
u
re' into maint
commit
|
commitdiff
|
tree
2011-11-01
J
u
nio C
H
amano
M
erge j
n
/maint-htt
p
-e
r
r
o
r
-message
commit
|
commitdiff
|
tree
2011-11-01
Junio
C Hamano
Merge
b
ran
c
h
'jk/name-hash-d
i
rent'
commit
|
commitdiff
|
tree
2011-11-01
Johann
e
s Sixt
n
a
me-has
h
.
c: alwa
y
s
initial
i
ze dir_
n
ext
p
o
inter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-11-01
Junio C
H
amano
M
e
r
g
e
b
r
a
nch 's
s
/blame-textconv-fak
e
-working-tree'
commit
|
commitdiff
|
tree
2011-11-01
Jun
i
o C
H
am
a
n
o
M
e
rge branch 'ef/ming
w
-u
p
l
oad-archive
'
commit
|
commitdiff
|
tree
2011-11-01
Junio C Hamano
Mer
g
e
bran
c
h 'dm/p
a
c
k
-objects-update'
commit
|
commitdiff
|
tree
2011-11-01
Junio C Ham
a
n
o
Merge b
r
a
nch 'nd/pr
e
tty-commit-log
-
message'
commit
|
commitdiff
|
tree
2011-11-01
Erik Fa
y
e-
L
und
mingw: poll
.
h is no lo
n
ger in sys/
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-31
P
a
t T
h
o
y
ts
t7511: a
v
oid use of
r
eserved filename on Wind
o
ws
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-31
Junio C Hamano
Git 1
.
7
.
8-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-31
Junio C H
a
mano
Merge branch 'jk/
g
it-tricks'
commit
|
commitdiff
|
tree
2011-10-31
Erik F
a
ye-Lund
u
pload-archive: use star
t
_command instead
o
f fork
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-31
Erik
F
a
y
e-Lund
compat/win32/poll
.
c: upgrade
from upstream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-31
Eri
k
F
aye-Lund
mingw: move poll
out of sys-folder
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-28
Juni
o
C Hamano
(squash) test
f
or previous
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-28
Sebastian S
c
hubert
h
bla
m
e
.
c
: Pro
p
er
l
y initialize
s
t
r
buf
a
fter
c
alling,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-27
Jun
i
o C Hamano
Update draft relea
s
e notes to 1
.
7
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-10-27
Junio C
H
amano
Merge br
a
nch '
s
n/compl
e
te-bas
h
-wo-proc
e
s
s-
s
ubst'
commit
|
commitdiff
|
tree
2011-10-27
Junio C Hamano
Merge
branch 'rj/gi
t
web-clean-js'
commit
|
commitdiff
|
tree
next