repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase--merge: fix --skip with two conflicts in a row
2014-06-16
b
r
ian m
.
carlson
r
e
base--mer
g
e
: fix --skip with two conflicts in
a row
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-30
Ju
n
io C Hamano
Git 1
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-28
J
unio
C
Hamano
Merge b
r
anch 'rh/
p
rompt-pcm
o
de-avoid-ev
a
l-on-refname
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Junio C
H
amano
Merge branch 'mw/symlinks' int
o
m
a
int
commit
|
commitdiff
|
tree
2014-05-19
R
i
chard Hansen
g
it-promp
t
.
sh: don
'
t
a
s
s
ume the shell expan
d
s the value
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-09
Ju
n
io C
Hamano
Git
1
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Jonath
a
n Nieder
she
l
l
d
oc: remove stray "+" in
e
xa
m
ple
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Junio
C
Hama
n
o
Start preparin
g
for 1
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Junio C H
a
m
a
no
M
er
g
e
bra
n
ch 'cl/p
4
-use-diff-tre
e
' into maint
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Merge
b
ranch 'rh/
p
r
ompt-pcm
o
de-a
v
o
i
d-eval-on-refn
a
m
e
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio C
H
amano
Merge branch
'
k
m/avoid-non-f
u
nction-
r
eturn-in-r
e
base
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
J
un
i
o C
H
aman
o
M
e
rge branch 'tb/un
i
code-6
.
3
-
z
e
ro-width'
i
n
to
maint
commit
|
commitdiff
|
tree
2014-05-08
J
unio C H
a
mano
M
e
r
ge branch 'km/avoid-bs-in-she
l
l-glob' into
m
aint
commit
|
commitdiff
|
tree
2014-05-08
Ju
n
io
C
Hamano
Merge
b
r
a
n
c
h 'km/av
o
i
d
-cp-a' into maint
commit
|
commitdiff
|
tree
2014-05-07
Tolga Ceylan
git-p4: for
m
at-patch to diff
-
tree change
b
r
eaks binary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-24
Martin Er
i
k
W
e
rner
setup
:
f
i
x windows
path buffe
r
over-stepping
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-22
R
ichard Hans
e
n
git-pr
o
mpt
.
sh
:
don
'
t put un
s
anitized branch names in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-17
Kyle J
.
McKay
Re
v
er
t
"rebase: fix run_specif
i
c
_
re
b
as
e
's use of "ret
u
rn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-17
Kyle J
.
McKay
rebase
:
avoid non
-
function u
s
e
of "return" on F
r
ee
B
SD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-11
Kyle
J
.
Mc
K
ay
test: fix t5560 on
F
reeBSD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-11
Kyle J
.
Mc
K
ay
te
s
t: f
i
x t7001 cp to
use POSIX optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-09
Jun
i
o C Ha
m
ano
Git
1
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-09
Junio C Hamano
Me
r
ge bra
n
c
h
'jl/nor-or-nand-and'
int
o
maint
commit
|
commitdiff
|
tree
2014-04-09
Junio C
H
amano
M
e
rge branch 'cn/fetch-prune-
o
ve
r
lapping
-
d
est
i
na
t
ion
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Junio C
H
amano
Merge b
r
anch
'
mh/update-ref-
b
atch-create-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Junio C Hamano
Merge br
a
n
ch 'j
k
/commit-dat
e
s-par
s
ing-fi
x
' in
t
o maint
commit
|
commitdiff
|
tree
2014-04-09
J
u
ni
o
C Ham
a
n
o
Merg
e
br
a
nch '
j
c/fix-diff-no
-
index-diff-opt-parse'
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Junio C Hamano
Merge commit
'doc/http-back
e
nd: missing accent grav
e
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
T
h
omas Ac
k
erman
n
d
o
c/ht
t
p-backend: mi
s
sing a
c
c
e
n
t
grave in literal
m
ar
k
-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-09
Tor
s
ten
B
ögershau
s
e
n
u
t
f8
.
c: partially up
d
ate to version 6
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-08
Junio C Hama
n
o
Update draft
r
elease notes
to 1
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-08
Junio
C Hamano
Merge branch 'mm/stat
u
s-porcelain-forma
t
-i18n-fix'
.
.
.
commit
|
commitdiff
|
tree
2014-04-08
Junio C Hamano
Merg
e
branch 'bp
/
commit-p-edito
r
' in
t
o main
t
commit
|
commitdiff
|
tree
2014-04-03
Junio C Hamano
Start prep
a
ring for 1
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-03
J
unio C
H
amano
M
erge
b
r
a
nch
'
j
k/mv-submodules-fix'
i
nto maint
commit
|
commitdiff
|
tree
2014-04-03
Junio C
H
amano
Mer
g
e branch '
m
h/remov
e
-
subtree-lo
n
g
-
pathname-
f
ix'
.
.
.
commit
|
commitdiff
|
tree
2014-04-03
Junio C Ha
m
a
n
o
M
e
r
ge br
a
nch
'
j
k/
l
ib-
t
erminal-
l
azy'
into maint
commit
|
commitdiff
|
tree
2014-04-03
Junio C H
a
mano
Merge branch 'nd/
i
ndex-pa
c
k-error-message' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2014-04-03
Juni
o
C
Haman
o
M
e
r
g
e branch 'us/printf-not-echo' in
t
o
maint
commit
|
commitdiff
|
tree
2014-04-03
Junio C
H
a
mano
Merge br
a
n
ch 'r
r
/
d
oc-merge-
s
tra
t
egie
s
'
i
nto
m
a
i
nt
commit
|
commitdiff
|
tree
2014-04-03
Junio C Hamano
Merge
b
r
an
c
h
'jk/sh
a
l
low-
u
pd
a
te-fix
'
into maint
commit
|
commitdiff
|
tree
2014-04-03
J
unio C Hamano
Merge branch 'jc
/
st
a
sh-pop-
n
ot-
p
o
p
ped' into
m
aint
commit
|
commitdiff
|
tree
2014-04-03
Junio
C Hamano
M
e
rge branch 'jn/wt-status'
into maint
commit
|
commitdiff
|
tree
2014-04-02
Am
a
n Gupta
update-r
e
f:
f
ail c
r
eate operati
o
n ov
e
r stdin i
f
ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-01
Je
f
f King
t4
2
12: loosen f
a
r
-in-future
test
f
or AIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-01
Jeff Ki
n
g
date: recognize bog
u
s F
r
eeBSD gm
t
ime output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-31
Justin Lebar
code and test: fix m
i
suses of "n
o
r"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-31
Ju
s
tin Lebar
comments
:
fix mis
u
ses
of "nor"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-31
Jus
t
in
Lebar
contrib: fix m
i
suses o
f
"n
o
r
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-31
Justin Lebar
Documentati
o
n
:
fix m
i
s
u
se
s
of "
n
o
r"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-31
Junio C H
a
mano
diff-n
o
-index: correctly diagn
o
se err
o
r return from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-26
Car
l
os Martín N
i
eto
fe
t
c
h: handle
ov
e
r
l
aping refspe
c
s on --prun
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-26
Matthieu Moy
status: disable
transl
a
tion w
h
en --porcel
a
in is use
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
Junio C
H
a
m
a
n
o
Git 1
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
Ju
n
io C
H
ama
n
o
Merge branc
h
'jk/clean
-
d-pathspec' into maint
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
M
erge
b
r
a
n
c
h 'd
a
/dif
f
too
l
-g
i
t-fi
l
es' into
m
aint
commit
|
commitdiff
|
tree
2014-03-18
Ju
n
io C Haman
o
M
erge branch 'jk
/
remote-pushr
e
mote-config-reading'
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
J
un
i
o C Hamano
Merge branch 'jk/commit-dates
-
pa
r
sing-fix' into maint
commit
|
commitdiff
|
tree
2014-03-18
J
u
nio C Hamano
Me
r
ge branch
'tr/diff
-
sub
m
odule
-
no-reuse-worktree'
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
Merge branch 'nd/reset-setup-worktre
e
' i
n
to maint
commit
|
commitdiff
|
tree
2014-03-18
Junio C Ha
m
an
o
Me
r
g
e branch 'jc/check-att
r
-h
o
nor-working-tree'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
J
u
nio C Hamano
M
e
rge branch 'b
k
/refr
e
sh-missing-ok-in-m
e
r
ge-rec
u
rsive
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
Junio
C
Ham
a
no
Merge branch 'ds/rev
-
parse-re
q
uired-
a
rgs' in
t
o
m
aint
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
Merge branch 'jk/c
o
nf
i
g-p
a
th-include-fix' into
mai
n
t
commit
|
commitdiff
|
tree
2014-03-18
Junio
C
Hamano
Merge
b
ranch 'nd/diff-quiet-stat-dirty' into mai
n
t
commit
|
commitdiff
|
tree
2014-03-18
J
unio C Hamano
Merge branch '
n
d/http-fetch-shallow-fix' into maint
commit
|
commitdiff
|
tree
2014-03-18
Junio C
H
a
m
ano
M
erge branch 'nd
/
s
u
bmod
u
le-pathspec-ending-wi
t
h-slash
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
Uw
e
Sto
r
beck
test-lib
.
sh: d
o
n
ot
"
e
c
ho" caller-suppli
e
d strin
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
Benoit Pierre
run-command: mark
r
un_hook_w
i
th
_
c
u
stom_i
n
dex as deprecated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
Benoit Pierre
merge h
o
ok t
e
s
ts: fix and up
d
ate tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
Be
n
oit Pierre
merge
:
fix GIT_EDITO
R
ove
r
ri
d
e fo
r
commit ho
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
Be
n
o
it
P
i
erre
commit: fix patch hunk edit
i
ng w
i
th "commit
-
p -m"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
Benoit Pierre
test patc
h
hunk editing with "c
o
mmit -p -m"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-17
Ramkumar
R
amachandra
Doc
u
menta
t
ion/
m
erge-
s
tr
a
tegi
e
s: avoid hyphenated commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-17
Ju
n
io C
H
amano
i
ndex-pack: report
error us
i
ng the correct
v
a
ria
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-17
Jeff
King
sha
l
low:
v
erify shallow
file after taking
l
ock
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-17
Uwe Storbeck
re
b
ase
-
i: do not "e
c
ho" random user-supplied s
t
rings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-17
br
i
an m
.
carlson
mv: preve
n
t
m
ism
a
tched data when ignor
i
ng
e
rrors
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-14
J
e
f
f
King
t
/
lib-t
e
r
m
i
nal:
make TTY a lazy pr
e
requisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-13
Mi
c
h
a
el
H
ag
g
erty
ent
r
y
.
c:
f
i
x
p
ossible buffer overflow in remove_
s
u
b
tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-13
Michael Hagger
t
y
chec
k
o
u
t_en
t
ry
(
): use the strbuf throughout the function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-12
J
u
nio
C Hamano
w
t-status: lift the artificua
l
"at l
e
ast 20 c
o
lumns
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-12
Jonathan Nieder
wt-status: i18n
o
f section labels
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-12
Jonath
a
n Nieder
wt-s
t
atus: ext
r
act the code to compute
wi
d
th for labels
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-12
Junio
C
Hamano
wt-
s
tat
u
s: mak
e
f
ull label stri
n
g to
b
e s
u
bject t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-11
J
o
h
n Keeping
b
u
iltin/mv:
f
i
x
out of bounds write
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-11
B
e
noit Pierre
m
e
rge ho
o
k tests
:
use 'test_must_
f
a
i
l
' instead of '!'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-11
Benoit Pie
r
r
e
merge ho
o
k
test
s
: fix
m
issing
'&&' in test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-11
Jeff
K
ing
clean: s
i
m
p
lify dir/not-dir logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-11
Jeff King
c
lean: res
p
ect pathspecs with "-d"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-07
Jeff Kin
g
show
_
ident_date
:
fix
t
z range check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-05
Jun
i
o C Hamano
t7800: add a
d
ifftool
t
est for
.
g
it-f
i
l
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-28
Carlos M
a
r
t
ín Nieto
fetch: add a failing tes
t
for prunni
n
g with overlapping
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-27
Jef
f
King
shallow: automatically
c
lean up shallow temp
f
ile
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-27
Jef
f
King
shal
l
ow: use stat_
v
ali
d
ity to check
f
or u
p
-
to-date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-26
Junio C Hamano
stash pop: mentio
n
w
e
did not
d
rop
the s
t
ash upon failing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-24
Nguyễn T
h
á
i
N
g
ọc Duy
d
i
ff: do n
o
t quit ear
l
y
o
n
s
t
at
-
dirty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-24
Nguyễn
T
hái Ngọc D
u
y
diff
.
c: m
o
ve d
i
ffcore_skip_stat
_
unm
a
tch core logi
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-24
Ngu
y
ễn Thá
i
Ng
ọ
c Duy
c
l
ean:
use c
a
che_name_is
_
other()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-24
Nguyễ
n
Thái N
g
ọ
c D
u
y
cl
e
an: replace match_pathspec() with dir_p
a
th_matc
h
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next