git, branch v2.4.8

Git 2.4.8

2015-08-03T17:43:01Z

Signed-off-by: Junio C Hamano

Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint

2015-08-03T17:41:34Z

Abandoning an already applied change in "git rebase -i" with "--continue" left CHERRY_PICK_HEAD and confused later steps. * js/rebase-i-clean-up-upon-continue-to-skip: rebase -i: do not leave a CHERRY_PICK_HEAD file behind t3404: demonstrate CHERRY_PICK_HEAD bug

Merge branch 'ss/clone-guess-dir-name-simplify' into maint

2015-08-03T17:41:33Z

Code simplification. * ss/clone-guess-dir-name-simplify: clone: simplify string handling in guess_dir_name()

Merge branch 'sg/completion-commit-cleanup' into maint

2015-08-03T17:41:33Z

* sg/completion-commit-cleanup: completion: teach 'scissors' mode to 'git commit --cleanup='

Merge branch 'pt/am-abort-fix' into maint

2015-08-03T17:41:32Z

Various fixes around "git am" that applies a patch to a history that is not there yet. * pt/am-abort-fix: am --abort: keep unrelated commits on unborn branch am --abort: support aborting to unborn branch am --abort: revert changes introduced by failed 3way merge am --skip: support skipping while on unborn branch am -3: support 3way merge on unborn branch am --skip: revert changes introduced by failed 3way merge

Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint

2015-08-03T17:41:31Z

"git for-each-ref" reported "missing object" for 0{40} when it encounters a broken ref. The lack of object whose name is 0{40} is not the problem; the ref being broken is. * mh/reporting-broken-refs-from-for-each-ref: read_loose_refs(): treat NULL_SHA1 loose references as broken read_loose_refs(): simplify function logic for-each-ref: report broken references correctly t6301: new tests of for-each-ref error handling

Merge branch 'sg/commit-cleanup-scissors' into maint

2015-08-03T17:41:30Z

"git commit --cleanup=scissors" was not careful enough to protect against getting fooled by a line that looked like scissors. * sg/commit-cleanup-scissors: commit: cope with scissors lines in commit message

Git 2.4.7

2015-07-27T19:25:42Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/pretty-encoding-doc' into maint

2015-07-27T19:21:48Z

Doc update. * jk/pretty-encoding-doc: docs: clarify that --encoding can produce invalid sequences

Merge branch 'tb/checkout-doc' into maint

2015-07-27T19:21:47Z

Doc update. * tb/checkout-doc: git-checkout.txt: document "git checkout " better