repo.or.cz
/
alt-git.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
brian
m
.
carlson
r
ebase--merge:
fix --skip with two conflic
t
s in
a row
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-30
Junio C
H
a
m
ano
Git 1
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-28
Junio C Hamano
Merge branch
'rh/prompt-pcmod
e
-
avoid-eval-on
-
r
efname
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Junio C Ham
a
no
Merge b
r
anch 'mw/symlinks' into
maint
commit
|
commitdiff
|
tree
2014-05-19
Richa
r
d Hans
e
n
g
it-promp
t
.
sh: don't ass
u
me the shell expands the value
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-09
Junio
C Hamano
Git 1
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
J
o
n
athan Nie
d
er
shel
l
d
o
c:
remove stra
y
"+" in
e
xample
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Start preparing for 1
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
J
u
nio C Ham
a
no
Merge bra
n
ch
'
cl/p4-use-diff-tree' into maint
commit
|
commitdiff
|
tree
2014-05-08
Junio
C Ha
m
ano
M
erge branch 'rh/prompt-pcmode-avo
i
d-
e
v
a
l-on
-
refna
m
e
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
J
u
nio C Hamano
Merge b
r
anch 'km/av
o
id-non-function-return-in-rebase
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Juni
o
C Hamano
M
e
rge branch '
t
b
/unicode-6
.
3-zero-width' in
t
o
maint
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
M
e
r
ge branch 'km/avoi
d
-bs-in
-
sh
e
ll-glo
b
' into
m
a
int
commit
|
commitdiff
|
tree
2014-05-08
Junio C Ham
a
no
M
e
r
ge
branch 'km/a
v
oid-cp-a' into mai
n
t
commit
|
commitdiff
|
tree
2014-05-07
Tolga Ceylan
git-p4:
format-patch to diff-t
r
ee cha
n
ge
b
r
eaks binary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-24
Martin Er
i
k Werner
set
u
p: fix wi
n
d
ows path buf
f
er
o
ve
r
-s
t
epping
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-22
Richard Hansen
git-promp
t
.
sh
:
don't
put unsan
i
ti
z
ed b
r
anch names
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-17
K
y
le J
.
M
cKay
Revert
"
rebase: fix
r
un_
s
pecific_rebase's use of "r
e
turn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-17
Kyle J
.
M
cKay
r
e
base: avoid non-function use of
"return" on Fre
e
BS
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-11
Kyle
J
.
M
c
Kay
test: fix t5560 on FreeBSD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-11
Kyle J
.
McKay
t
e
st:
fix t7
0
01 cp to use
POSIX options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-09
Junio C Hamano
Git 1
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-09
J
unio C Hama
n
o
Mer
g
e branch 'jl/nor
-
or-nan
d
-an
d
'
into ma
i
nt
commit
|
commitdiff
|
tree
2014-04-09
Junio C Hamano
Merge br
a
nch 'cn/fetch-pru
n
e-overlapping-dest
i
nation
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Ju
n
io C H
a
mano
Merge bran
c
h 'mh/update-ref-b
a
tch-c
r
eate-fix' into
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Jun
i
o
C Hamano
Merge branc
h
'jk
/
commit
-
dates-parsing
-
f
i
x'
i
nto
maint
commit
|
commitdiff
|
tree
2014-04-09
Junio C Hamano
Merge
b
r
an
c
h
'
jc/
f
ix-diff-no-
i
n
dex
-
di
f
f-opt-parse'
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Junio C Hamano
M
erge c
o
mm
i
t 'doc/h
t
tp-backend: missing accen
t
grave
.
.
.
commit
|
commitdiff
|
tree
2014-04-09
Thomas Ac
k
ermann
doc/http-back
e
nd: missing accent g
r
ave i
n
literal
mark-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-09
Torsten Bögers
h
ausen
utf8
.
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 Hamano
Upda
t
e d
r
a
ft release notes
t
o 1
.
9
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-08
Junio C Haman
o
Merge br
a
nc
h
'
mm/status-porcelain-format-i18n-fix'
.
.
.
commit
|
commitdiff
|
tree
2014-04-08
Junio C Ha
m
ano
Merge branc
h
'bp/commit-p-edi
t
or' into
ma
i
nt
commit
|
commitdiff
|
tree
2014-04-03
Juni
o
C Hamano
Start pr
e
paring for 1
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-03
J
u
nio
C Ham
a
no
Mer
g
e branch 'jk/mv-submodules-fix'
int
o
maint
commit
|
commitdiff
|
tree
2014-04-03
Ju
n
io C Ha
m
ano
Merge bran
c
h
'
mh
/
remove-s
u
btree
-
l
o
ng-pathn
a
m
e-fix'
.
.
.
commit
|
commitdiff
|
tree
2014-04-03
Junio C
H
a
m
a
no
Merge
b
ranch
'
jk/l
i
b-terminal-lazy' into maint
commit
|
commitdiff
|
tree
2014-04-03
Jun
i
o C Ham
a
n
o
M
e
rge br
a
nch 'nd/index-
p
ack-error
-
m
e
ssage' int
o
maint
commit
|
commitdiff
|
tree
2014-04-03
Junio C
H
aman
o
Merge branch 'us/
p
rintf-not-echo' i
n
to
maint
commit
|
commitdiff
|
tree
2014-04-03
J
u
nio C Hamano
M
erge branch 'rr/doc-me
r
ge-
s
tr
a
t
e
gies' into mai
n
t
commit
|
commitdiff
|
tree
2014-04-03
Junio C H
a
mano
M
e
rge
branch 'jk/shallow-u
p
date-fix
'
into maint
commit
|
commitdiff
|
tree
2014-04-03
Junio C Hama
n
o
Merge branch 'jc/stash-pop-
n
ot-pop
p
ed' into maint
commit
|
commitdiff
|
tree
2014-04-03
Junio C Hamano
M
erge
b
ranch 'j
n
/wt
-
status
'
into maint
commit
|
commitdiff
|
tree
2014-04-02
Aman Gup
t
a
update-re
f
: fail cre
a
t
e
operation over s
t
di
n
if ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-01
Jeff King
t4212:
lo
o
sen far-in-fut
u
re te
s
t
for AI
X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-01
J
eff Ki
n
g
d
ate: reco
g
n
ize
b
o
gus Free
B
SD gmtim
e
output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-31
Justin Lebar
code and test: f
i
x misu
s
es of "nor"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-31
Just
i
n Lebar
co
m
ments: fix misuses of "nor"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-31
Justin Lebar
co
n
trib: fix m
i
suses of "nor"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-31
Justin Lebar
Documenta
t
ion: f
i
x misuses of "no
r
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-31
Junio
C
Hamano
d
iff-no-inde
x
:
correctly diagnose
e
r
r
or r
e
tu
r
n from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-26
Carl
o
s Martín Nieto
fetch: han
d
l
e
overlap
i
ng
refspecs on --prune
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-26
Ma
t
thi
e
u Moy
sta
t
us: disable tran
s
lation when
--porcelain
i
s used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
Junio C
Hama
n
o
Git 1
.
9
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
J
unio C Hamano
Merge branch 'jk/clean-
d
-pa
t
hspec' into mai
n
t
commit
|
commitdiff
|
tree
2014-03-18
Junio
C
Hamano
M
er
g
e branch 'da/dif
f
tool-git-files' in
t
o maint
commit
|
commitdiff
|
tree
2014-03-18
Jun
i
o C Hamano
Merg
e
branch
'jk
/
re
m
o
te-pushremote-config-reading'
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
J
u
n
io C Hamano
Merge branch '
j
k/commit-date
s
-
p
ars
i
ng-fix' i
n
to maint
commit
|
commitdiff
|
tree
2014-03-18
Junio C
Ham
a
no
Merge branch 'tr
/
diff-su
b
m
o
dule-
n
o
-reuse-worktre
e
'
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
J
unio
C H
a
mano
Merge branch 'nd
/
reset-s
e
t
u
p-worktree' into m
a
in
t
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
Merge branch 'j
c
/ch
e
ck-attr-honor-
w
orking-tr
e
e' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
Junio C Haman
o
Merge b
r
anch '
b
k/refresh-m
i
ssing-ok-i
n
-merg
e
-recursive
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
Junio C H
a
mano
Merge branch 'ds/rev-parse-requi
r
ed-args' into maint
commit
|
commitdiff
|
tree
2014-03-18
Jun
i
o C Hamano
Me
r
ge branch 'j
k
/config-path-include-fix
'
into maint
commit
|
commitdiff
|
tree
2014-03-18
Jun
i
o C Hamano
Merge bra
n
ch
'nd/diff-quiet-stat-dirt
y
' into maint
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
Me
r
ge branch 'nd/ht
t
p-fetch-sha
l
low-fix' into m
a
int
commit
|
commitdiff
|
tree
2014-03-18
Junio C Hamano
Merge branc
h
'nd/submodul
e
-pathspec-end
i
ng
-
with-s
l
ash
.
.
.
commit
|
commitdiff
|
tree
2014-03-18
Uwe St
o
rbeck
test-lib
.
sh:
do n
o
t "echo" caller-s
u
pplied strings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
Benoit Pie
r
re
run-command: mark run_hook_with_custom_index a
s
deprecated
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
B
e
noit
P
ie
r
re
merge
h
ook tests: fi
x
and update
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
Be
n
oit Pierre
merge: fix
GIT_EDITOR
override for commit hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
Be
n
oit Pierre
commit: fix patch hunk editing
with "co
m
mit -p -m"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-18
Benoit Pi
e
r
re
t
e
s
t
p
atc
h
hunk editing with "commit -p -m"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-17
Ramkumar Ramachandra
Documen
t
ation/merg
e
-strategies: a
v
oid
h
yphenated commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-17
Junio C H
a
m
ano
in
d
e
x-pack:
report
e
rror usin
g
the cor
r
e
c
t variab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-17
Jeff
K
ing
shallow
:
verify shallow file after taking lo
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-17
Uwe
S
t
orbeck
re
b
ase -i: do not "echo" random user-supplied str
i
ngs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-17
br
i
an
m
.
car
l
s
o
n
mv: pre
v
ent
m
ismatched data
w
h
e
n
igno
r
ing erro
r
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-14
Je
f
f Ki
n
g
t/lib-terminal:
m
a
ke
T
TY a
l
azy
p
rerequ
i
sit
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-13
M
ichael Hagge
r
ty
entry
.
c: fix possible
b
u
f
fer overflow in remove_subtre
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-13
M
icha
e
l
H
agger
t
y
ch
e
cko
u
t_entr
y
(): use the strb
u
f thr
o
ughout
t
he fu
n
ction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-12
Junio C Ham
a
no
wt-s
t
atus: lift t
h
e artificual "at le
a
s
t 20 colu
m
ns
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-12
Jonathan Nieder
w
t-
s
tatus: i18n of s
e
ction labels
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-12
Jona
t
h
a
n Nieder
wt-sta
t
us: extract th
e
code
t
o compute
w
i
dth for
labels
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-12
J
u
nio C H
a
mano
wt-status
:
make full
lab
e
l string to be s
u
bj
e
ct to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-11
Jo
h
n
Keeping
builtin/mv
:
fix
o
ut of
bounds w
r
ite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-11
B
e
n
oi
t
Pierre
merge hook tests: us
e
'test_mus
t
_fail
'
i
n
stead of '!'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-11
Benoit Pierre
merge hook t
e
sts: fix miss
i
ng
'&&
'
in test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-11
Jeff King
clean: simplify dir/not-dir l
o
gic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-11
Jeff King
clean: r
e
s
p
ect p
a
thspecs
with "-d"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-07
Jeff King
show_
i
dent_date: f
i
x tz range check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-03-05
Junio C Hamano
t7
8
00: ad
d
a difftool
t
est for
.
git-files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-28
Carlos
Martí
n
Nie
t
o
fetch: add a failing test for
prunning
w
i
t
h o
v
erla
p
pin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-27
Jeff K
i
ng
shallow: automatically clean up sha
l
low tempfil
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-27
Jef
f
King
s
hallow: use
s
tat_va
l
idity to chec
k
f
or
u
p
-
t
o-date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-26
Junio
C
Haman
o
stash
pop: mention we
d
i
d not
drop th
e
s
t
ash upon failing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-24
N
guy
ễ
n Th
á
i N
g
ọc
D
uy
diff: do
not quit
early o
n
stat-dirty files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-24
N
g
uy
ễ
n Th
á
i Ngọc Duy
di
f
f
.
c
:
move diffcore_skip_stat
_
unmatch
core logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-24
Nguyễn Thái Ngọc Duy
cl
e
an: use cac
h
e
_
name_
i
s_other()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-02-24
N
g
uyễn T
h
ái Ng
ọ
c Duy
clean:
replace match_pathspe
c
() w
i
th d
i
r_path_match()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next